diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index e76e5f5c..1792e345 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -1,6 +1,9 @@ name: Deploy on: + push: + branches: + - fix/** workflow_run: workflows: ["CI (Java)", "CI (Python/FastAPI)"] types: [completed] @@ -18,14 +21,6 @@ jobs: steps: - uses: actions/checkout@v4 - -# - name: Dump workflow_run event payload -# run: | -# echo "---- Full workflow_run payload ----" -# echo "${{ toJson(github.event) }}" | jq -# echo exit -1 - - - name: Create env file run: | echo "DB_HOST=${{ secrets.DB_HOST }}" > .env.prod @@ -68,14 +63,13 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - docker pull ghcr.io/${{ env.REPO_LC }}/user-service:latest - docker pull ghcr.io/${{ env.REPO_LC }}/pre-processing-service:latest + echo ls - docker compose down - docker compose up -d + docker-compose down + docker-compose up -d sleep 10 - docker compose ps + docker-compose ps docker image prune -f diff --git a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java index d4392fe5..c4bff4f5 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java @@ -8,7 +8,7 @@ import site.icebang.domain.email.dto.EmailRequest; @Service -@Profile({"test-unit", "test-e2e", "test-integration", "local", "develop"}) +@Profile({"test-unit", "test-e2e", "test-integration", "local", "develop", "production"}) @Slf4j public class MockEmailService implements EmailService { diff --git a/docker/production/docker-compose.yml b/docker/production/docker-compose.yml index fa3ca0cc..be22e934 100644 --- a/docker/production/docker-compose.yml +++ b/docker/production/docker-compose.yml @@ -7,10 +7,13 @@ services: restart: always ports: - "80:8080" + - "443:8080" networks: - app-network env_file: - .env.prod + environment: + - SPRING_PROFILES_ACTIVE=production pre-processing-service: image: ghcr.io/kernel180-be12/final-4team-icebang/pre-processing-service:latest