Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions .github/workflows/deploy-java.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Deploy

on:
push:
branches:
- fix/**
workflow_run:
workflows: ["CI (Java)", "CI (Python/FastAPI)"]
types: [completed]
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 3 additions & 0 deletions docker/production/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading