Skip to content

Main branch 최신화 #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SangHyeok0908 merged 3 commits into from
Dec 22, 2025
Merged

Main branch 최신화 #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce044a8
Revert "Revert "Revert 636 hotfix/issue 635""
SangHyeok0908 Dec 22, 2025
cdce074
Fix
SangHyeok0908 Dec 22, 2025
8f076d9
Merge pull request #642 from Recruiting-Your-Club/revert-640-revert-6…
SangHyeok0908 Dec 22, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/server-prod-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ jobs:

- name: Make application.yml
run: |
echo "${{ secrets.APPLICATION_YML }}" > ./server/resources/application.yml
mkdir -p ./server/config
echo "${{ secrets.APPLICATION_YML }}" > ./server/config/application.yml

- name: Deploy with Docker Compose
run: |
Expand Down
2 changes: 1 addition & 1 deletion server/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- TZ=Asia/Seoul
- PROFILES=${PROFILES:?PROFILES environment variable is not set}
volumes:
- ./resources/application.yml:/app/config/application.yml:ro
- ./server/config/application.yml:/app/config/application.yml:ro
restart: always


Expand Down