From e22fb664695506451333774dab4e95537b820a37 Mon Sep 17 00:00:00 2001 From: taekyung Date: Fri, 10 Oct 2025 11:10:56 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20S3=20prefix=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20?= =?UTF-8?q?server=20=ED=94=84=EB=A1=9C=ED=8C=8C=EC=9D=BC=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/prod-server.yml | 1 + .github/workflows/test-server-cd.yml | 3 ++- src/main/resources/application-server.yml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/prod-server.yml b/.github/workflows/prod-server.yml index 85298b85..a8d7490b 100644 --- a/.github/workflows/prod-server.yml +++ b/.github/workflows/prod-server.yml @@ -90,6 +90,7 @@ jobs: -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}}" \ + -e AWS_S3_PREFIX="${{secrets.PROD_AWS_S3_PREFIX}}" \ # RabbitMQ -e SPRING_RABBITMQ_HOST="${{secrets.PROD_RABBITMQ_HOST}}" \ -e SPRING_RABBITMQ_USERNAME="${{secrets.PROD_RABBITMQ_USERNAME}}" \ diff --git a/.github/workflows/test-server-cd.yml b/.github/workflows/test-server-cd.yml index 61fb774b..5f809434 100644 --- a/.github/workflows/test-server-cd.yml +++ b/.github/workflows/test-server-cd.yml @@ -67,7 +67,8 @@ jobs: # 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}}" \ + -e AWS_S3_BUCKECT_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \ + -e AWS_S3_PREFIX="${{secrets.TEST_AWS_S3_PREFIX}}" \ # RabbitMQ -e SPRING_RABBITMQ_HOST="${{secrets.TEST_RABBITMQ_HOST}}" \ -e SPRING_RABBITMQ_USERNAME="${{secrets.TEST_RABBITMQ_USERNAME}}" \ 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} From 95772f20088b606a3a63d199ab675ac0b4c43867 Mon Sep 17 00:00:00 2001 From: taekyung Date: Fri, 10 Oct 2025 11:38:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20cd=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/prod-server.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prod-server.yml b/.github/workflows/prod-server.yml index a8d7490b..388d99f6 100644 --- a/.github/workflows/prod-server.yml +++ b/.github/workflows/prod-server.yml @@ -102,8 +102,8 @@ jobs: -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}}" \ + -e KAKAO_REDIRECT_URI="${{secrets.PROD_OAUTH_KAKAO_REDIRECT_URI}}" \ + -e GOOGLE_REDIRECT_URI="${{secrets.PROD_OAUTH_GOOGLE_REDIRECT_URI}}" \ # Sentry -e SENTRY_DSN="${{secrets.SENTRY_DSN}}" \ # OpenAI From 563d544e2ad935c120b701c3eed30011a79669cd Mon Sep 17 00:00:00 2001 From: taekyung Date: Fri, 10 Oct 2025 11:47:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20docker=20run=20=EC=A3=BC=EC=84=9D?= =?UTF-8?q?=20=EC=97=86=EC=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/prod-server.yml | 10 ---------- .github/workflows/test-server-cd.yml | 11 ----------- 2 files changed, 21 deletions(-) diff --git a/.github/workflows/prod-server.yml b/.github/workflows/prod-server.yml index 388d99f6..22ec476a 100644 --- a/.github/workflows/prod-server.yml +++ b/.github/workflows/prod-server.yml @@ -86,38 +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}}" \ -e AWS_S3_PREFIX="${{secrets.PROD_AWS_S3_PREFIX}}" \ - # RabbitMQ -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="${{secrets.PROD_OAUTH_KAKAO_REDIRECT_URI}}" \ -e GOOGLE_REDIRECT_URI="${{secrets.PROD_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/.github/workflows/test-server-cd.yml b/.github/workflows/test-server-cd.yml index 5f809434..36996c01 100644 --- a/.github/workflows/test-server-cd.yml +++ b/.github/workflows/test-server-cd.yml @@ -60,42 +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_BUCKECT_NAME="${{secrets.AWS_S3_BUCKET_NAME}}" \ -e AWS_S3_PREFIX="${{secrets.TEST_AWS_S3_PREFIX}}" \ - # RabbitMQ -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