Skip to content

Commit

Permalink
New change to the docker-compose.yml and a change in the order of the…
Browse files Browse the repository at this point in the history
… docker-push-backend in case it makes a difference
  • Loading branch information
Mister-Mario committed Mar 9, 2024
1 parent 343b65a commit ecfa56e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: users/userservice
docker-push-gatewayservice:
name: Push gateway service Docker Image to GitHub Packages
docker-push-backend:
name: Push backend Docker Image to GitHub Packages
runs-on: ubuntu-latest
permissions:
contents: read
Expand All @@ -67,13 +67,13 @@ jobs:
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: arquisoft/wiq_en1b/gatewayservice
name: arquisoft/wiq_en1b/backend
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: gatewayservice
docker-push-backend:
name: Push backend Docker Image to GitHub Packages
workdir: backend/wiq
docker-push-gatewayservice:
name: Push gateway service Docker Image to GitHub Packages
runs-on: ubuntu-latest
permissions:
contents: read
Expand All @@ -83,15 +83,15 @@ jobs:
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: arquisoft/wiq_en1b/backend
name: arquisoft/wiq_en1b/gatewayservice
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: backend/wiq
deploy:
workdir: gatewayservice
deploy:
name: Deploy over SSH
runs-on: ubuntu-latest
needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp,docker-push-backend]
needs: [docker-push-backend, docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp]
steps:
- name: Deploy over SSH
uses: fifsky/ssh-action@master
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
backend:
container_name: backend_wiq-${teamname:-defaultASW}
profiles: ["dev", "prod"]
build:
context: ./backend/wiq
dockerfile: Dockerfile
build: ./backend/wiq
ports:
- 8090:8090

Expand Down

0 comments on commit ecfa56e

Please sign in to comment.