diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml index 033a332c..d19d3c15 100644 --- a/.github/workflows/dev-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -98,7 +98,18 @@ jobs: export SWAGGER_USERNAME=${{ secrets.SWAGGER_USERNAME }} export SWAGGER_PASSWORD=${{ secrets.SWAGGER_PASSWORD }} - + + export FIREBASE_TYPE=${{ secrets.FIREBASE_TYPE }} + export FIREBASE_PROJECT_ID=${{ secrets.FIREBASE_PROJECT_ID }} + export FIREBASE_PRIVATE_KEY_ID=${{ secrets.FIREBASE_PRIVATE_KEY_ID }} + export FIREBASE_PRIVATE_KEY=${{ secrets.FIREBASE_PRIVATE_KEY }} + export FIREBASE_CLIENT_EMAIL=${{ secrets.FIREBASE_CLIENT_EMAIL }} + export FIREBASE_CLIENT_ID=${{ secrets.FIREBASE_CLIENT_ID }} + export FIREBASE_AUTH_URI=${{ secrets.FIREBASE_AUTH_URI }} + export FIREBASE_TOKEN_URI=${{ secrets.FIREBASE_TOKEN_URI }} + export FIREBASE_AUTH_PROVIDER_X509_CERT_URL=${{ secrets.FIREBASE_AUTH_PROVIDER_X509_CERT_URL }} + export FIREBASE_CLIENT_X509_CERT_URL=${{ secrets.FIREBASE_CLIENT_X509_CERT_URL }} + echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin cd /home/ubuntu diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml index 30d4fa02..f810d90d 100644 --- a/.github/workflows/prod-cd.yml +++ b/.github/workflows/prod-cd.yml @@ -109,6 +109,17 @@ jobs: export SWAGGER_USERNAME=${{ secrets.SWAGGER_USERNAME }} export SWAGGER_PASSWORD=${{ secrets.SWAGGER_PASSWORD }} + export FIREBASE_TYPE=${{ secrets.FIREBASE_TYPE }} + export FIREBASE_PROJECT_ID=${{ secrets.FIREBASE_PROJECT_ID }} + export FIREBASE_PRIVATE_KEY_ID=${{ secrets.FIREBASE_PRIVATE_KEY_ID }} + export FIREBASE_PRIVATE_KEY=${{ secrets.FIREBASE_PRIVATE_KEY }} + export FIREBASE_CLIENT_EMAIL=${{ secrets.FIREBASE_CLIENT_EMAIL }} + export FIREBASE_CLIENT_ID=${{ secrets.FIREBASE_CLIENT_ID }} + export FIREBASE_AUTH_URI=${{ secrets.FIREBASE_AUTH_URI }} + export FIREBASE_TOKEN_URI=${{ secrets.FIREBASE_TOKEN_URI }} + export FIREBASE_AUTH_PROVIDER_X509_CERT_URL=${{ secrets.FIREBASE_AUTH_PROVIDER_X509_CERT_URL }} + export FIREBASE_CLIENT_X509_CERT_URL=${{ secrets.FIREBASE_CLIENT_X509_CERT_URL }} + echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin cd /home/ubuntu diff --git a/clokey-api/dev-compose.yml b/clokey-api/dev-compose.yml index a02df69c..360a9c13 100644 --- a/clokey-api/dev-compose.yml +++ b/clokey-api/dev-compose.yml @@ -29,6 +29,18 @@ services: APPLE_CLIENT_ID: ${APPLE_CLIENT_ID} APPLE_CLIENT_SECRET: ${APPLE_CLIENT_SECRET} + # Firebase + FIREBASE_TYPE: ${FIREBASE_TYPE} + FIREBASE_PROJECT_ID: ${FIREBASE_PROJECT_ID} + FIREBASE_PRIVATE_KEY_ID: ${FIREBASE_PRIVATE_KEY_ID} + FIREBASE_PRIVATE_KEY: ${FIREBASE_PRIVATE_KEY} + FIREBASE_CLIENT_EMAIL: ${FIREBASE_CLIENT_EMAIL} + FIREBASE_CLIENT_ID: ${FIREBASE_CLIENT_ID} + FIREBASE_AUTH_URI: ${FIREBASE_AUTH_URI} + FIREBASE_TOKEN_URI: ${FIREBASE_TOKEN_URI} + FIREBASE_AUTH_PROVIDER_X509_CERT_URL: ${FIREBASE_AUTH_PROVIDER_X509_CERT_URL} + FIREBASE_CLIENT_X509_CERT_URL: ${FIREBASE_CLIENT_X509_CERT_URL} + # JWT JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_TOKEN_SECRET} JWT_REFRESH_TOKEN_SECRET: ${JWT_REFRESH_TOKEN_SECRET} diff --git a/clokey-api/prod-compose.yml b/clokey-api/prod-compose.yml index c75a69cc..57cc3c3c 100644 --- a/clokey-api/prod-compose.yml +++ b/clokey-api/prod-compose.yml @@ -29,6 +29,18 @@ services: APPLE_CLIENT_ID: ${APPLE_CLIENT_ID} APPLE_CLIENT_SECRET: ${APPLE_CLIENT_SECRET} + # Firebase + FIREBASE_TYPE: ${FIREBASE_TYPE} + FIREBASE_PROJECT_ID: ${FIREBASE_PROJECT_ID} + FIREBASE_PRIVATE_KEY_ID: ${FIREBASE_PRIVATE_KEY_ID} + FIREBASE_PRIVATE_KEY: ${FIREBASE_PRIVATE_KEY} + FIREBASE_CLIENT_EMAIL: ${FIREBASE_CLIENT_EMAIL} + FIREBASE_CLIENT_ID: ${FIREBASE_CLIENT_ID} + FIREBASE_AUTH_URI: ${FIREBASE_AUTH_URI} + FIREBASE_TOKEN_URI: ${FIREBASE_TOKEN_URI} + FIREBASE_AUTH_PROVIDER_X509_CERT_URL: ${FIREBASE_AUTH_PROVIDER_X509_CERT_URL} + FIREBASE_CLIENT_X509_CERT_URL: ${FIREBASE_CLIENT_X509_CERT_URL} + # JWT JWT_ACCESS_TOKEN_SECRET: ${JWT_ACCESS_TOKEN_SECRET} JWT_REFRESH_TOKEN_SECRET: ${JWT_REFRESH_TOKEN_SECRET} diff --git a/clokey-api/src/main/resources/application-dev.yml b/clokey-api/src/main/resources/application-dev.yml index 014fb409..1f3344e6 100644 --- a/clokey-api/src/main/resources/application-dev.yml +++ b/clokey-api/src/main/resources/application-dev.yml @@ -76,7 +76,6 @@ swagger: username: ${SWAGGER_USERNAME} password: ${SWAGGER_PASSWORD} - spring-doc: default-consumes-media-type: application/json default-produces-media-type: application/json @@ -85,3 +84,15 @@ spring-doc: operations-sorter : method path: /swagger-ui doc-expansion : none + +firebase: + type: ${FIREBASE_TYPE} + project-id: ${FIREBASE_PROJECT_ID} + private-key-id: ${FIREBASE_PRIVATE_KEY_ID} + private-key: ${FIREBASE_PRIVATE_KEY} + client-email: ${FIREBASE_CLIENT_EMAIL} + client-id: ${FIREBASE_CLIENT_ID} + auth-uri: ${FIREBASE_AUTH_URI} + token-uri: ${FIREBASE_TOKEN_URI} + auth-provider-x509-cert-url: ${FIREBASE_AUTH_PROVIDER_X509_CERT_URL} + client-x509-cert-url: ${FIREBASE_CLIENT_X509_CERT_URL} diff --git a/clokey-api/src/main/resources/application-local.yml b/clokey-api/src/main/resources/application-local.yml index 632243f1..61584579 100644 --- a/clokey-api/src/main/resources/application-local.yml +++ b/clokey-api/src/main/resources/application-local.yml @@ -85,3 +85,16 @@ logging: level: org.hibernate.SQL: DEBUG org.hibernate.orm.jdbc.bind: TRACE + +firebase: + type: ${FIREBASE_TYPE} + project-id: ${FIREBASE_PROJECT_ID} + private-key-id: ${FIREBASE_PRIVATE_KEY_ID} + private-key: ${FIREBASE_PRIVATE_KEY} + client-email: ${FIREBASE_CLIENT_EMAIL} + client-id: ${FIREBASE_CLIENT_ID} + auth-uri: ${FIREBASE_AUTH_URI} + token-uri: ${FIREBASE_TOKEN_URI} + auth-provider-x509-cert-url: ${FIREBASE_AUTH_PROVIDER_X509_CERT_URL} + client-x509-cert-url: ${FIREBASE_CLIENT_X509_CERT_URL} + diff --git a/clokey-api/src/main/resources/application-prod.yml b/clokey-api/src/main/resources/application-prod.yml index e9db8efe..8888e4dc 100644 --- a/clokey-api/src/main/resources/application-prod.yml +++ b/clokey-api/src/main/resources/application-prod.yml @@ -71,3 +71,15 @@ aws: s3: bucket: ${PROD_S3_BUCKET} endpoint: ${PROD_S3_ENDPOINT:https://s3.ap-northeast-2.amazonaws.com} + +firebase: + type: ${FIREBASE_TYPE} + project-id: ${FIREBASE_PROJECT_ID} + private-key-id: ${FIREBASE_PRIVATE_KEY_ID} + private-key: ${FIREBASE_PRIVATE_KEY} + client-email: ${FIREBASE_CLIENT_EMAIL} + client-id: ${FIREBASE_CLIENT_ID} + auth-uri: ${FIREBASE_AUTH_URI} + token-uri: ${FIREBASE_TOKEN_URI} + auth-provider-x509-cert-url: ${FIREBASE_AUTH_PROVIDER_X509_CERT_URL} + client-x509-cert-url: ${FIREBASE_CLIENT_X509_CERT_URL}