Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

E2e deploy hotfix #117

Merged
merged 18 commits into from
Apr 15, 2024
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
10 changes: 8 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,17 @@ jobs:
- run: npm --prefix users/userservice install
- run: npm --prefix gatewayservice install
- run: npm --prefix webapp install
- run: npm --prefix webapp run build
- run: npm --prefix webapp run test:e2e
- run: CI=false npm --prefix webapp run build
- run: CI=true npm --prefix webapp run test:e2e

docker-push-webapp:
name: Push webapp Docker Image to GitHub Packages
runs-on: ARM64
permissions:
contents: read
packages: write
needs: [e2e-tests]
# needs: [unit-tests]
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
Expand All @@ -66,6 +68,7 @@ jobs:
contents: read
packages: write
needs: [e2e-tests]
# needs: [unit-tests]
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
Expand All @@ -83,6 +86,7 @@ jobs:
contents: read
packages: write
needs: [e2e-tests]
# needs: [unit-tests]
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
Expand All @@ -100,6 +104,7 @@ jobs:
contents: read
packages: write
needs: [e2e-tests]
# needs: [unit-tests]
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
Expand All @@ -117,6 +122,7 @@ jobs:
contents: read
packages: write
needs: [e2e-tests]
# needs: [unit-tests]
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
Expand Down
8 changes: 5 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@ services:
build: ./questionservice
depends_on:
- mongodb
- userservice
ports:
- "8010:8010"
networks:
- mynetwork
environment:
MONGODB_URI: mongodb://mongodb:27017/userdb
USER_SERVICE_URL: http://userservice:8001
# platform: linux/arm64
gatewayservice:
container_name: gatewayservice-${teamname:-defaultASW}
Expand Down Expand Up @@ -83,14 +85,14 @@ services:
depends_on:
- gatewayservice
ports:
- "3000:3000"
- "80:80"
# platform: linux/arm64


prometheus:
image: prom/prometheus
container_name: prometheus-${teamname:-defaultASW}
profiles: ["dev"]
profiles: ["dev","prod"]
networks:
- mynetwork
volumes:
Expand All @@ -105,7 +107,7 @@ services:
grafana:
image: grafana/grafana
container_name: grafana-${teamname:-defaultASW}
profiles: ["dev"]
profiles: ["dev","prod"]
networks:
- mynetwork
volumes:
Expand Down
2 changes: 1 addition & 1 deletion gatewayservice/monitoring/prometheus/prometheus.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
global:
scrape_interval: 5s
scrape_configs:
- job_name: "example-nodejs-app"
- job_name: "WIQ"
static_configs:
- targets: ["gatewayservice:8000"]
Loading