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
19 changes: 18 additions & 1 deletion .github/workflows/cd-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}" \
Comment thread
githyj-jang marked this conversation as resolved.
'
.containerDefinitions |= map(
if .name == $CN then
Expand All @@ -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},
Comment thread
githyj-jang marked this conversation as resolved.
{"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)
)
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Comment thread
githyj-jang marked this conversation as resolved.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ RUN chown -R app:app /app
USER app
EXPOSE 19500

ENTRYPOINT ["java", "-jar", "/app/app.jar"]
ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "/app/app.jar"]
3 changes: 3 additions & 0 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ spring:
application:
name: reservation-service

jackson:
time-zone: Asia/Seoul

cache:
type: redis

Expand Down
Loading