diff --git a/.github/workflows/prod-server.yml b/.github/workflows/prod-server.yml index 85298b85..22ec476a 100644 --- a/.github/workflows/prod-server.yml +++ b/.github/workflows/prod-server.yml @@ -86,37 +86,28 @@ jobs: -e SPRING_DATASOURCE_URL="${{secrets.PROD_DB_URL}}" \ -e SPRING_DATASOURCE_USERNAME="${{secrets.PROD_DB_USERNAME}}" \ -e SPRING_DATASOURCE_PASSWORD="${{secrets.PROD_DB_PASSWORD}}" \ - # AWS -e AWS_ACCESS_KEY_ID="${{secrets.AWS_ACCESS_KEY_ID}}" \ -e AWS_SECRET_ACCESS_KEY="${{secrets.AWS_SECRET_ACCESS_KEY}}" \ -e AWS_S3_BUCKET_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \ - # RabbitMQ + -e AWS_S3_PREFIX="${{secrets.PROD_AWS_S3_PREFIX}}" \ -e SPRING_RABBITMQ_HOST="${{secrets.PROD_RABBITMQ_HOST}}" \ -e SPRING_RABBITMQ_USERNAME="${{secrets.PROD_RABBITMQ_USERNAME}}" \ -e SPRING_RABBITMQ_PASSWORD="${{secrets.PROD_RABBITMQ_PASSWORD}}" \ - # Redis -e REDIS_HOST="${{secrets.PROD_REDIS_HOST}}" \ -e REDIS_PASSWORD="${{secrets.PROD_REDIS_PASSWORD}}" \ - # OAuth2 -e KAKAO_CLIENT_ID="${{secrets.OAUTH_KAKAO_CLIENT_ID}}" \ -e GOOGLE_CLIENT_ID="${{secrets.OAUTH_GOOGLE_CLIENT_ID}}" \ -e GOOGLE_CLIENT_SECRET="${{secrets.OAUTH_GOOGLE_CLIENT_SECRET}}" \ - -e KAKAO_REDIRECT_URI="${{PROD_OAUTH_KAKAO_REDIRECT_URI}}" \ - -e GOOGLE_REDIRECT_URI="${{PROD_OAUTH_GOOGLE_REDIRECT_URI}}" \ - # Sentry + -e KAKAO_REDIRECT_URI="${{secrets.PROD_OAUTH_KAKAO_REDIRECT_URI}}" \ + -e GOOGLE_REDIRECT_URI="${{secrets.PROD_OAUTH_GOOGLE_REDIRECT_URI}}" \ -e SENTRY_DSN="${{secrets.SENTRY_DSN}}" \ - # OpenAI -e OPENAI_API_KEY="${{secrets.OPENAI_API_KEY}}" \ - # Liveblocks -e LIVEBLOCKS_SECRET_KEY="${{secrets.LIVEBLOCKS_SECRET_KEY}}" \ - # naver -e NAVER_CLIENT_ID="${{secrets.NAVER_CLIENT_ID}}" \ -e NAVER_CLIENT_SECRET="${{secrets.NAVER_CLIENT_SECRET}}" \ - # JWT -e JWT_SECRET_KEY="${{secrets.JWT_SECRET_KEY}}" \ -e JWT_ACCESS_TOKEN_VALIDITY="${{secrets.JWT_ACCESS_TOKEN_VALIDITY}}" \ -e JWT_REFRESH_TOKEN_VALIDITY="${{secrets.JWT_REFRESH_TOKEN_VALIDITY}}" \ - # Front -e FRONT_REDIRECT_DOMAIN="${{secrets.FRONT_REDIRECT_DOMAIN}}" \ ghcr.io/${{ github.repository }}/zoopzoop:latest diff --git a/.github/workflows/test-server-cd.yml b/.github/workflows/test-server-cd.yml index 61fb774b..36996c01 100644 --- a/.github/workflows/test-server-cd.yml +++ b/.github/workflows/test-server-cd.yml @@ -60,41 +60,31 @@ jobs: --name $NEW_CONTAINER \ --network common \ -e SPRING_PROFILES_ACTIVE=server \ - # DB -e SPRING_DATASOURCE_URL="${{secrets.TEST_DB_URL}}" \ -e SPRING_DATASOURCE_USERNAME="${{secrets.TEST_DB_USERNAME}}" \ -e SPRING_DATASOURCE_PASSWORD="${{secrets.TEST_DB_PASSWORD}}" \ - # AWS -e AWS_ACCESS_KEY_ID="${{secrets.AWS_ACCESS_KEY_ID}}" \ -e AWS_SECRET_ACCESS_KEY="${{secrets.AWS_SECRET_ACCESS_KEY}}" \ - -e AWS_S3_BUCKET_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \ - # RabbitMQ + -e AWS_S3_BUCKECT_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \ + -e AWS_S3_PREFIX="${{secrets.TEST_AWS_S3_PREFIX}}" \ -e SPRING_RABBITMQ_HOST="${{secrets.TEST_RABBITMQ_HOST}}" \ -e SPRING_RABBITMQ_USERNAME="${{secrets.TEST_RABBITMQ_USERNAME}}" \ -e SPRING_RABBITMQ_PASSWORD="${{secrets.TEST_RABBITMQ_PASSWORD}}" \ - # Redis -e REDIS_HOST="${{secrets.TEST_REDIS_HOST}}" \ -e REDIS_PASSWORD="${{secrets.TEST_REDIS_PASSWORD}}" \ - # OAuth2 -e KAKAO_CLIENT_ID="${{secrets.OAUTH_KAKAO_CLIENT_ID}}" \ -e GOOGLE_CLIENT_ID="${{secrets.OAUTH_GOOGLE_CLIENT_ID}}" \ -e GOOGLE_CLIENT_SECRET="${{secrets.OAUTH_GOOGLE_CLIENT_SECRET}}" \ -e KAKAO_REDIRECT_URI="${{secrets.TEST_OAUTH_KAKAO_REDIRECT_URI}}" \ -e GOOGLE_REDIRECT_URI="${{secrets.TEST_OAUTH_GOOGLE_REDIRECT_URI}}" \ - # Sentry -e SENTRY_DSN="${{secrets.SENTRY_DSN}}" \ - # OpenAI -e OPENAI_API_KEY="${{secrets.OPENAI_API_KEY}}" \ - # Liveblocks -e LIVEBLOCKS_SECRET_KEY="${{secrets.LIVEBLOCKS_SECRET_KEY}}" \ - # naver -e NAVER_CLIENT_ID="${{secrets.NAVER_CLIENT_ID}}" \ -e NAVER_CLIENT_SECRET="${{secrets.NAVER_CLIENT_SECRET}}" \ - # JWT -e JWT_SECRET_KEY="${{secrets.JWT_SECRET_KEY}}" \ -e JWT_ACCESS_TOKEN_VALIDITY="${{secrets.JWT_ACCESS_TOKEN_VALIDITY}}" \ -e JWT_REFRESH_TOKEN_VALIDITY="${{secrets.JWT_REFRESH_TOKEN_VALIDITY}}" \ - # Front -e FRONT_REDIRECT_DOMAIN="${{secrets.FRONT_REDIRECT_DOMAIN}}" \ ghcr.io/${{ github.repository }}/zoopzoop:latest diff --git a/src/main/resources/application-server.yml b/src/main/resources/application-server.yml index 42aaf406..8eee5d11 100644 --- a/src/main/resources/application-server.yml +++ b/src/main/resources/application-server.yml @@ -40,3 +40,7 @@ sentry: environment: prod traces-sample-rate: 0.2 +cloud: + aws: + s3: + prefix: ${AWS_S3_PREFIX}