diff --git a/.github/workflows/cd-prod.yml b/.github/workflows/cd-prod.yml index c03d60c..c86c912 100644 --- a/.github/workflows/cd-prod.yml +++ b/.github/workflows/cd-prod.yml @@ -73,6 +73,14 @@ jobs: --arg EUREKA_HOST "${{ vars.EUREKA_HOST }}" \ --arg EUREKA_PORT "${{ vars.EUREKA_PORT }}" \ --arg JWT_SECRET "${{ secrets.JWT_SECRET }}" \ + --arg POSTGRES_HOST "${{ vars.POSTGRES_HOST }}" \ + --arg POSTGRES_PORT "${{ vars.POSTGRES_PORT }}" \ + --arg POSTGRES_DB "${{ vars.POSTGRES_DB }}" \ + --arg POSTGRES_USER "${{ vars.POSTGRES_USER }}" \ + --arg POSTGRES_PASSWORD "${{ secrets.POSTGRES_PASSWORD }}" \ + --arg REDIS_HOST "${{ vars.REDIS_HOST }}" \ + --arg REDIS_PORT "${{ vars.REDIS_PORT }}" \ + --arg INTERNAL_AUTH_SECRET "${{ secrets.INTERNAL_AUTH_SECRET }}" \ ' .containerDefinitions |= map( if .name == $CN then @@ -81,10 +89,19 @@ jobs: [ {"name":"SPRING_PROFILES_ACTIVE","value":$SPRING_PROFILES_ACTIVE}, {"name":"SERVER_PORT","value":$SERVER_PORT}, + {"name":"TZ","value":"Asia/Seoul"}, {"name":"EUREKA_ENABLED","value":$EUREKA_ENABLED}, {"name":"EUREKA_HOST","value":$EUREKA_HOST}, {"name":"EUREKA_PORT","value":$EUREKA_PORT}, - {"name":"JWT_SECRET","value":$JWT_SECRET} + {"name":"JWT_SECRET","value":$JWT_SECRET}, + {"name":"POSTGRES_HOST","value":$POSTGRES_HOST}, + {"name":"POSTGRES_PORT","value":$POSTGRES_PORT}, + {"name":"POSTGRES_DB","value":$POSTGRES_DB}, + {"name":"POSTGRES_USER","value":$POSTGRES_USER}, + {"name":"POSTGRES_PASSWORD","value":$POSTGRES_PASSWORD}, + {"name":"REDIS_HOST","value":$REDIS_HOST}, + {"name":"REDIS_PORT","value":$REDIS_PORT}, + {"name":"INTERNAL_AUTH_SECRET","value":$INTERNAL_AUTH_SECRET} ] + (.environment // []) | unique_by(.name) ) diff --git a/.github/workflows/ci-prod.yml b/.github/workflows/ci-prod.yml index 6feac6f..916cebd 100644 --- a/.github/workflows/ci-prod.yml +++ b/.github/workflows/ci-prod.yml @@ -38,6 +38,7 @@ jobs: run: echo "IMAGE_TAG=$(git rev-parse --short HEAD)" >> $GITHUB_ENV # 태그란? 이미지 버전 이름 - name: Configure AWS credentials (OIDC) # OIDC 기반으로 역할 자격증명 + if: github.event_name == 'push' uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.AWS_ROLE_ARN }} diff --git a/Dockerfile b/Dockerfile index 708b2ef..0631f0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,4 +17,4 @@ RUN chown -R app:app /app USER app EXPOSE 19500 -ENTRYPOINT ["java", "-jar", "/app/app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "/app/app.jar"] \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index ce51114..89e6a53 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -14,6 +14,9 @@ spring: application: name: reservation-service + jackson: + time-zone: Asia/Seoul + cache: type: redis