Skip to content

Commit

Permalink
fix: 깃 이그노어 파일 수정 및 도커파일 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
huncozyboy committed Oct 5, 2024
1 parent 9bf2530 commit 99000ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ jobs:
- name: Docker build & push
run: |
docker login -u ${{ secrets.DEV_DOCKER_USER_EMAIL }} -p ${{ secrets.DEV_DOCKER_USER_TOKEN }}
docker build -t ${{ secrets.DEV_DOCKER_USER_NAME }}/weeth .
docker build -f Dockerfile-dev -t ${{ secrets.DEV_DOCKER_USER_NAME }}/weeth .
docker push ${{ secrets.DEV_DOCKER_USER_NAME }}/weeth
deploy:
runs-on: ubuntu-latest
needs: build
if: github.ref == 'refs/heads/develop'
if: github.event_name == 'push'

steps:
- uses: actions/checkout@v4
Expand All @@ -69,6 +69,11 @@ jobs:
sudo docker stop $EXISTING_CONTAINER_ID
sudo docker rm $EXISTING_CONTAINER_ID
fi
EXISTING_CONTAINER_ID=$(sudo docker ps -q -f "status=exited")
if [ ! -z "$EXISTING_CONTAINER_ID" ]; then
sudo docker rm $EXISTING_CONTAINER_ID
fi
sudo docker pull ${{ secrets.DEV_DOCKER_USER_NAME }}/weeth
sudo docker run --name spring -d -p 8080:8080 --env-file ./weeth-dev.env -e TZ=Asia/Seoul ${{ secrets.DEV_DOCKER_USER_NAME }}/weeth
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
HELP.md
weeth-dev.env
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
Expand Down

0 comments on commit 99000ee

Please sign in to comment.