diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4c434c9..52f1f61 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -30,9 +30,18 @@ jobs: username: ubuntu key: ${{ secrets.EC2_KEY }} port: '22' - source: "./docker" + source: "./docker/docker-compose.yml, docker/.env" target: "~/app" + - name: Login to DockerHub + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + + - name: Build Docker image + run: docker build -t shlee054/ticket911-app:latest ./docker + + - name: Push Docker image + run: docker push shlee054/ticket911-app:latest + - name: Deploy via SSH uses: appleboy/ssh-action@master with: @@ -69,11 +78,7 @@ jobs: # Kill existing Java Processes pkill -f 'java -jar' || true - # Deploy with Docker Compose - cd ~/app/docker || exit 1 - docker compose down --remove-orphans || true - docker compose up --build -d - - echo "Waiting for containers to be up..." - sleep 10 - docker compose ps \ No newline at end of file + cd ~/app || exit 1 + sudo docker compose pull + sudo docker compose down --remove-orphans || true + sudo docker compose up -d \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7858a53..9be31bf 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,9 +2,7 @@ version: "3.9" services: app: - build: - context: .. - dockerfile: docker/Dockerfile + image: shlee054/ticket911-app:latest container_name: ticket911-app ports: - "8080:8080"