Skip to content

Commit

Permalink
improve artifact upload during deployment workflow to include all fil…
Browse files Browse the repository at this point in the history
…es for dev and prod mode in a streamlined manner
  • Loading branch information
Wolkenfarmer committed Oct 3, 2024
1 parent bede178 commit d7000d8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:

- name: Run docker containers with deploy dev configuration
run: |
cp backend/dps_training_k/deployment/nginx/nginx_deploy_dev.conf ./nginx_dev.conf
docker compose -f docker-compose.dev.yml up -d
- name: Run integration tests
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ jobs:
- name: Prepare deployment files
run: |
mkdir deployment_files
cp docker-compose.prod.yml deployment_files/docker-compose.yml
cp ./.env.prod deployment_files/
cp ./.env.dev deployment_files/
cp backend/dps_training_k/deployment/nginx/nginx_deploy_prod.conf deployment_files/nginx.conf
cp docker-compose.prod.yml deployment_files/docker-compose.prod.yml
cp docker-compose.dev.yml deployment_files/docker-compose.dev.yml
cp ./.env.prod deployment_files/.env.prod
cp ./.env.dev deployment_files/.env.dev
cp backend/dps_training_k/deployment/nginx/nginx_deploy_prod.conf deployment_files/nginx_prod.conf
cp backend/dps_training_k/deployment/nginx/nginx_deploy_dev.conf deployment_files/nginx_dev.conf
- name: Archive deployment files
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ services:
- django
volumes:
- static_volume:/app/staticfiles
- ./backend/dps_training_k/deployment/nginx/nginx_deploy_dev.conf:/etc/nginx/conf.d/nginx.conf
- ./nginx_dev.conf:/etc/nginx/conf.d/nginx.conf
ports:
- "80:80"
- "443:443"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ services:
- static_volume:/app/staticfiles
- /etc/letsencrypt/live/klinik-dps.de/fullchain.pem:/etc/nginx/ssl/fullchain.pem:ro
- /etc/letsencrypt/live/klinik-dps.de/privkey.pem:/etc/nginx/ssl/privkey.pem:ro
- ./nginx.conf:/etc/nginx/conf.d/nginx.conf
- ./nginx_prod.conf:/etc/nginx/conf.d/nginx.conf
ports:
- "80:80"
- "443:443"
Expand Down

0 comments on commit d7000d8

Please sign in to comment.