chore: merge branches and production github workflow

RealToken-Community · Jun 20, 2024 · 80005aa · 80005aa
1 parent fb9598e
commit 80005aa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 101 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -3,7 +3,8 @@ name: Test and deploy to branch
 on:
   push:
     branches:
-      # - preprod
+      - master
+      - preprod
       - develop
 
 jobs:
@@ -75,4 +76,7 @@ jobs:
           git pull origin ${DOCKER_BRANCH}
           docker compose --file docker-compose-branch.yml pull
           docker login -u ${{ secrets.DOCKER_LOGIN }} -p ${{ secrets.DOCKER_PASSWD }} ${DOCKER_REGISTRY}
-          THEGRAPH_API_KEY=${{ secrets.THEGRAPH_API_KEY }} COMMUNITY_API_KEY=${{ secrets.COMMUNITY_API_KEY }} docker compose --project-name ${{ github.ref_name }}-dashboard --file docker-compose-branch.yml up -d'
+          THEGRAPH_API_KEY=${{ secrets.THEGRAPH_API_KEY }} \
+          COMMUNITY_API_KEY=${{ secrets.COMMUNITY_API_KEY }} \
+          HOSTNAME=${{ github.ref_name == 'master' && 'dashboard.realt.community' || 'dashboard.${DOCKER_BRANCH}.realt.community' }} \
+          docker compose --project-name ${{ github.ref_name }}-dashboard --file docker-compose-branch.yml up -d'
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
diff --git a/docker-compose-branch.yml b/docker-compose-branch.yml
@@ -9,7 +9,7 @@ services:
       - traefik-realt
     labels:
       - 'traefik.enable=true'
-      - 'traefik.http.routers.dashboard-${DOCKER_BRANCH}.rule=Host(`dashboard.${DOCKER_BRANCH}.realt.community`)'
+      - 'traefik.http.routers.dashboard-${DOCKER_BRANCH}.rule=Host(`${HOSTNAME}`)'
       - 'traefik.http.routers.dashboard-${DOCKER_BRANCH}.entrypoints=websecure'
       - 'traefik.http.services.dashboard-${DOCKER_BRANCH}.loadbalancer.server.port=3000'
     restart: always

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml