diff --git a/.github/workflows/dev-build-and-deploy.yaml b/.github/workflows/dev-build-and-deploy.yaml index cd5928b0..da038b52 100644 --- a/.github/workflows/dev-build-and-deploy.yaml +++ b/.github/workflows/dev-build-and-deploy.yaml @@ -24,6 +24,13 @@ jobs: java-version: "17" distribution: "corretto" + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_S3_ACCESS_KEY }} + aws-secret-access-key: ${{ secrets.AWS_S3_SECRET_KEY }} + aws-region: ap-northeast-2 + - name: Cache Gradle uses: actions/cache@v3 with: @@ -113,34 +120,10 @@ jobs: -e SPRING_PROFILES_ACTIVE=dev \ -e SPRING_SERVLET_MULTIPART_MAX-FILE-SIZE=30MB \ -e SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE=30MB \ - -e AWS_REDIS_HOST=${{ secrets.DEV_REDIS_HOST }} \ - -e AWS_REDIS_PORT=${{ secrets.DEV_REDIS_PORT }} \ - -e SPRING_DATASOURCE_URL=${{ secrets.DEV_DB_URL }} \ - -e SPRING_DATASOURCE_USERNAME=${{ secrets.DEV_DB_USERNAME }} \ - -e SPRING_DATASOURCE_PASSWORD=${{ secrets.DEV_DB_PASSWORD }} \ - -e SPRING_JWT_SECRET=${{ secrets.JWT_SECRET }} \ - -e OAUTH_CLIENTID=${{ secrets.KAKAO_CLIENT_ID }} \ - -e OAUTH_KAUTHTOKENURLHOST=${{ secrets.KAUTH_TOKEN_URL_HOST }} \ - -e OAUTH_KAUTHUSERURLHOST=${{ secrets.KAUTH_USER_URL_HOST }} \ - -e OAUTH_KAKAOCLIENTID=${{ secrets.OAUTH_KAKAOCLIENTID }} \ - -e OAUTH_KAKAOAUTHTOKENURLHOST=${{ secrets.KAKAOAUTHTOKENURLHOST }} \ - -e OAUTH_KAKAOAUTHUSERURLHOST=${{ secrets.KAKAOAUTHUSERURLHOST }} \ - -e OAUTH_KAKAOREDIRECTURL=${{ secrets.KAKAOREDIRECTURL }} \ - -e OAUTH_GOOGLECLIENTID=${{ secrets.GOOGLECLIENTID }} \ - -e OAUTH_GOOGLECLIENTSECRET=${{ secrets.GOOGLECLIENTSECRET }} \ - -e OAUTH_GOOGLEREDIRECTURL=${{ secrets.GOOGLEREDIRECTURL }} \ - -e OAUTH_GOOGLEAUTHTOKENURLHOST=${{ secrets.GOOGLEAUTHTOKENURLHOST }} \ - -e OAUTH_GOOGLEUSERURLHOST=${{ secrets.GOOGLEUSERURLHOST }} \ -e SPRING_JPA_HIBERNATE_DDL_AUTO=validate \ - -e AWS_S3_ACCESS_KEY=${{ secrets.AWS_S3_ACCESS_KEY }} \ - -e AWS_S3_SECRET_KEY=${{ secrets.AWS_S3_SECRET_KEY }} \ - -e AWS_S3_BUCKET_NAME=${{ secrets.DEV_AWS_S3_BUCKET_NAME }} \ - -e AWS_S3_BASICPROFILEIMAGEURL=${{ secrets.BASICPROFILEIMAGEURL }} \ -e TZ=Asia/Seoul \ - -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ -e SENTRY_ENABLE_TRACING=true \ -e SENTRY_ENVIRONMENT=prod \ - -e LOKI_URL=${{ secrets.LOKI_SERVER_URL }} \ ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:dev-${{ github.sha }} docker system prune -af diff --git a/.github/workflows/manual-prod-deploy.yaml b/.github/workflows/manual-prod-deploy.yaml index e56e7ce2..e230fac0 100644 --- a/.github/workflows/manual-prod-deploy.yaml +++ b/.github/workflows/manual-prod-deploy.yaml @@ -50,33 +50,9 @@ jobs: -e SPRING_PROFILES_ACTIVE=prod \ -e SPRING_SERVLET_MULTIPART_MAX-FILE-SIZE=30MB \ -e SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE=30MB \ - -e AWS_REDIS_HOST=${{ secrets.PROD_REDIS_HOST }} \ - -e AWS_REDIS_PORT=${{ secrets.PROD_REDIS_PORT }} \ - -e SPRING_DATASOURCE_URL=${{ secrets.PROD_DB_URL }} \ - -e SPRING_DATASOURCE_USERNAME=${{ secrets.PROD_DB_USERNAME }} \ - -e SPRING_DATASOURCE_PASSWORD=${{ secrets.PROD_DB_PASSWORD }} \ - -e SPRING_JWT_SECRET=${{ secrets.JWT_SECRET }} \ - -e KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }} \ - -e OAUTH_KAUTHTOKENURLHOST=${{ secrets.KAUTH_TOKEN_URL_HOST }} \ - -e OAUTH_KAUTHUSERURLHOST=${{ secrets.KAUTH_USER_URL_HOST }} \ - -e OAUTH_KAKAOCLIENTID=${{ secrets.OAUTH_KAKAOCLIENTID }} \ - -e OAUTH_KAKAOAUTHTOKENURLHOST=${{ secrets.KAKAOAUTHTOKENURLHOST }} \ - -e OAUTH_KAKAOAUTHUSERURLHOST=${{ secrets.KAKAOAUTHUSERURLHOST }} \ - -e OAUTH_KAKAOREDIRECTURL=${{ secrets.KAKAOREDIRECTURL }} \ - -e OAUTH_GOOGLECLIENTID=${{ secrets.GOOGLECLIENTID }} \ - -e OAUTH_GOOGLECLIENTSECRET=${{ secrets.GOOGLECLIENTSECRET }} \ - -e OAUTH_GOOGLEREDIRECTURL=${{ secrets.GOOGLEREDIRECTURL }} \ - -e OAUTH_GOOGLEAUTHTOKENURLHOST=${{ secrets.GOOGLEAUTHTOKENURLHOST }} \ - -e OAUTH_GOOGLEUSERURLHOST=${{ secrets.GOOGLEUSERURLHOST }} \ -e SPRING_JPA_HIBERNATE_DDL_AUTO=validate \ - -e AWS_S3_ACCESS_KEY=${{ secrets.AWS_S3_ACCESS_KEY }} \ - -e AWS_S3_SECRET_KEY=${{ secrets.AWS_S3_SECRET_KEY }} \ - -e AWS_S3_BUCKET_NAME=${{ secrets.PROD_AWS_S3_BUCKET_NAME }} \ - -e AWS_S3_BASICPROFILEIMAGEURL=${{ secrets.BASICPROFILEIMAGEURL }} \ -e TZ=Asia/Seoul \ - -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ -e SENTRY_ENABLE_TRACING=true \ -e SENTRY_ENVIRONMENT=prod \ - -e LOKI_URL=${{ secrets.LOKI_SERVER_URL }} \ ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:prod-${{ github.event.inputs.tag }} docker system prune -af \ No newline at end of file