Skip to content

Chore/resolve main develop conflict #194

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
catomat0 merged 11 commits into from
Mar 18, 2026
Merged

Chore/resolve main develop conflict #194

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
64532da
Merge pull request #158 from UMC-DearE/develop
choehyeonjin Feb 11, 2026
756210f
[DEPLOY] 2/12 ๋ฐฐํฌ (#163)
catomat0 Feb 11, 2026
3c3f354
[DEPLOY] 2/12 ํ”„๋กฌ ์ˆ˜์ • (#167)
catomat0 Feb 12, 2026
2b7556a
Merge pull request #170 from UMC-DearE/develop
choehyeonjin Feb 18, 2026
0f7f8da
Merge pull request #173 from UMC-DearE/develop
choehyeonjin Feb 18, 2026
d577742
Fix: AI ์ปจํ…์ธ  ๋‚ด์šฉ ์ˆ˜์ • ์‹œ ์žฌ๋ถ„์„ ์š”์ฒญ ๋ถ„๊ธฐ ์ถ”๊ฐ€ (#176)
catomat0 Feb 19, 2026
0f3306f
Merge pull request #180 from UMC-DearE/develop
choehyeonjin Feb 19, 2026
d19327c
Merge pull request #183 from UMC-DearE/develop
choehyeonjin Feb 19, 2026
eb59766
[DEPLOY] 3/18-20 UX ๊ฐœ์„ ์šฉ ๋ฐฐํฌ (#188)
catomat0 Mar 18, 2026
443e6c4
Resolve merge conflict in cd.yml
Mar 18, 2026
c4eeaca
Fix: cd.yml ์ˆ˜์ •
Mar 18, 2026
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
11 changes: 6 additions & 5 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,18 @@ jobs:
set -e
cd /home/ubuntu/deare

ENV_FILE=/home/ubuntu/deare/.env.prod
COMPOSE_FILE=/home/ubuntu/deare/docker-compose-dev.yml

docker-compose -f $COMPOSE_FILE pull app
docker-compose --env-file $ENV_FILE -f $COMPOSE_FILE pull app

if docker-compose -f $COMPOSE_FILE up -d; then
if docker-compose --env-file $ENV_FILE -f $COMPOSE_FILE up -d; then
echo "compose up succeeded without down"
else
echo "compose up failed. fallback to down -> up"
docker-compose -f $COMPOSE_FILE down
docker-compose -f $COMPOSE_FILE up -d
docker-compose --env-file $ENV_FILE -f $COMPOSE_FILE down
docker-compose --env-file $ENV_FILE -f $COMPOSE_FILE up -d
fi

docker-compose -f $COMPOSE_FILE ps
docker-compose --env-file $ENV_FILE -f $COMPOSE_FILE ps
docker image prune -f
Loading