diff --git a/.github/workflows/cd-prod.yml b/.github/workflows/cd-prod.yml index 3828ee47..8f02caee 100644 --- a/.github/workflows/cd-prod.yml +++ b/.github/workflows/cd-prod.yml @@ -35,6 +35,7 @@ jobs: with: context: . file: Docker/Dockerfile + platforms: linux/amd64 push: true tags: | ${{ secrets.DOCKERHUB_USERNAME }}/realmatch-backend:prod @@ -48,16 +49,15 @@ jobs: key: ${{ secrets.PROD_SERVER_SSH_KEY }} script: | cd /home/ubuntu/realmatch - git pull origin main - docker compose pull - docker compose up -d - + docker-compose pull + docker-compose up -d + echo "Waiting for app to start..." sleep 10 - - if ! docker compose ps | grep "Up"; then + + if ! docker-compose ps | grep "Up"; then echo "❌ Container is not running" - docker compose logs + docker-compose logs exit 1 - fi \ No newline at end of file + fi diff --git a/docker-compose.yaml b/docker-compose.yaml index a2d2f9df..12164669 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -25,12 +25,11 @@ services: - "6379:6379" app: - build: - context: . - dockerfile: Docker/Dockerfile + image: ${DOCKERHUB_USERNAME}/realmatch-backend:prod container_name: spring_app + restart: always ports: - - "6000:6000" + - "8080:6000" depends_on: - db - redis