Skip to content

Commit

Permalink
Depployment issues solved with api
Browse files Browse the repository at this point in the history
  • Loading branch information
UO289930 committed Mar 21, 2024
1 parent 8755318 commit d207fc2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
workdir: webapp
buildargs: |
API_URI
docker-push-apiservice:
docker-push-api:
name: Push api Docker Image to GitHub Packages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: arquisoft/wiq_en3a/apiservice
name: arquisoft/wiq_en3a/api
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
Expand All @@ -54,7 +54,7 @@ jobs:
deploy:
name: Deploy over SSH
runs-on: ubuntu-latest
needs: [docker-push-gatewayservice,docker-push-webapp, docker-push-apiservice]
needs: [docker-push-gatewayservice,docker-push-webapp, docker-push-api]
steps:
- name: Deploy over SSH
uses: fifsky/ssh-action@master
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ services:
networks:
- mynetwork

apiservice:
container_name: apiservice-${teamname:-defaultASW}
image: ghcr.io/arquisoft/wiq_en3a/apiservice:latest
api:
container_name: api-${teamname:-defaultASW}
image: ghcr.io/arquisoft/wiq_en3a/api:latest
profiles: ["dev", "prod"]
build: ./apiservice
build: ./api
depends_on:
- mongodb
ports:
Expand All @@ -32,13 +32,13 @@ services:
build: ./gatewayservice
depends_on:
- mongodb
- apiservice
- api
ports:
- "8000:8000"
networks:
- mynetwork
environment:
API_SERVICE_URL: http://apiservice:8002
API_SERVICE_URL: http://api:8002

webapp:
container_name: webapp-${teamname:-defaultASW}
Expand Down

0 comments on commit d207fc2

Please sign in to comment.