Merge pull request #956 from IntersectMBO/chore/set-analytics-dashboa…

…rd-domain-to-dev-only Set participation.sanchogov.tools domain to dev service only
IntersectMBO · May 8, 2024 · 3d8d728 · 3d8d728
2 parents 27ed3c3 + de9194c
commit 3d8d728
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-and-deploy-beta.yml b/.github/workflows/build-and-deploy-beta.yml
@@ -30,7 +30,7 @@ jobs:
       GTM_ID: ${{ secrets.GTM_ID }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
-      NEXT_PUBLIC_API_URL: "https://sanchogov.tools/api"
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
       NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
       NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml
@@ -29,7 +29,7 @@ jobs:
       GTM_ID: ${{ secrets.GTM_ID }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
-      NEXT_PUBLIC_API_URL: "https://dev-sanchonet.govtool.byron.network/api"
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
       NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
       NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

diff --git a/.github/workflows/build-and-deploy-staging.yml b/.github/workflows/build-and-deploy-staging.yml
@@ -31,7 +31,7 @@ jobs:
       GTM_ID: ${{ secrets.GTM_ID }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
-      NEXT_PUBLIC_API_URL: "https://staging.govtool.byron.network/api"
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
       NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
       NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

diff --git a/.github/workflows/build-and-deploy-test.yml b/.github/workflows/build-and-deploy-test.yml
@@ -31,7 +31,7 @@ jobs:
       GTM_ID: ${{ secrets.GTM_ID }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
-      NEXT_PUBLIC_API_URL: "https://test-sanchonet.govtool.byron.network/api"
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
       NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
       NGINX_BASIC_AUTH: ${{ secrets.NGINX_BASIC_AUTH }}
       PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

diff --git a/govtool/analytics-dashboard/Dockerfile b/govtool/analytics-dashboard/Dockerfile
@@ -17,6 +17,7 @@ RUN \
 
 # Rebuild the source code only when needed
 FROM base AS builder
+# Set the build arguments
 ARG NEXT_PUBLIC_API_URL
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules

diff --git a/scripts/govtool/config/templates/docker-compose.yml.tpl b/scripts/govtool/config/templates/docker-compose.yml.tpl
@@ -214,7 +214,6 @@ services:
     environment:
       - GA_CLIENT_EMAIL=${GA_CLIENT_EMAIL}
       - GA_PRIVATE_KEY=${GA_PRIVATE_KEY}
-      - GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_APPLICATION_CREDENTIALS}
       - GOOGLE_APPLICATION_CREDENTIALS=/run/secrets/google-credentials.json
       - NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
       - NEXT_PUBLIC_GA4_PROPERTY_ID=${NEXT_PUBLIC_GA4_PROPERTY_ID}
@@ -225,7 +224,7 @@ services:
     restart: always
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.to-analytics-dashboard.rule=Host(`participation.<DOMAIN>`)"
+      - "traefik.http.routers.to-analytics-dashboard.rule=Host(`participation.sanchogov.tools`)"
       - "traefik.http.routers.to-analytics-dashboard.entrypoints=websecure"
       - "traefik.http.routers.to-analytics-dashboard.tls.certresolver=myresolver"
       - "traefik.http.services.analytics-dashboard.loadbalancer.server.port=3000"