Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .github/workflows/dev-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/prod-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions clokey-api/dev-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
12 changes: 12 additions & 0 deletions clokey-api/prod-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
13 changes: 12 additions & 1 deletion clokey-api/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
13 changes: 13 additions & 0 deletions clokey-api/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}

12 changes: 12 additions & 0 deletions clokey-api/src/main/resources/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}