Skip to content

Commit

Permalink
๐Ÿ”จ refactor: docker compose ํŒŒ์ผ test ๋ฒ„์ „ ์ถ”๊ฐ€ ๋ฐ cicd ์ฝ”๋“œ ์ˆ˜์ •
Browse files Browse the repository at this point in the history
  • Loading branch information
Honghyeonji committed Jan 21, 2025
1 parent 71637c7 commit c0d7400
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/boolock-dev-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ jobs:
git pull origin HOTFIX/28
echo "DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}" > .env
echo "TYPE=test" >> .env
echo "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
sudo docker compose pull
sudo docker compose up -d --force-recreate --remove-orphans
sudo docker compose -f docker-compose.test.yml pull
sudo docker compose -f docker-compose.test.yml up -d --force-recreate --remove-orphans
1 change: 0 additions & 1 deletion .github/workflows/boolock-main-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ jobs:
git pull origin main
echo "DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}" > .env
echo "TYPE=prod" >> .env
echo "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
sudo docker compose pull
Expand Down
12 changes: 12 additions & 0 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
services:
frontend:
image: ${DOCKERHUB_USERNAME}/boolock_client_test:latest
pull_policy: always
ports:
- '80:80'

backend:
image: ${DOCKERHUB_USERNAME}/boolock_server_test:latest
pull_policy: always
ports:
- '3000:3000'
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
services:
frontend:
image: ${DOCKERHUB_USERNAME}/boolock_client_${TYPE}:latest
image: ${DOCKERHUB_USERNAME}/boolock_client_prod:latest
pull_policy: always
ports:
- '80:80'
- '${SSL_PORT:-}'
- '443:443'

backend:
image: ${DOCKERHUB_USERNAME}/boolock_server_${TYPE}:latest
image: ${DOCKERHUB_USERNAME}/boolock_server_prod:latest
pull_policy: always
ports:
- '3000:3000'

0 comments on commit c0d7400

Please sign in to comment.