Leaderboard integration

Author: jeffmaki

.github/workflows/build.yaml

@@ -27,8 +27,6 @@ jobs:
     timeout-minutes: 30
     steps:
         - uses: actions/checkout@v2
-#          with:
-#            submodules: recursive
 
         # frontend submod
         - name: Checkout frontend
@@ -85,6 +83,16 @@ jobs:
         - run: cd tasking-manager; echo TM_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"                                                                                                                   
 
 
+        # leaderboard submod
+        - name: Checkout leaderboard
+          uses: actions/checkout@v2
+          with:
+                 repository: TaskarCenterAtUW/workspaces-leaderboard
+                 path: leaderboard
+                 ref: refs/tags/${{github.event.inputs.env}}
+        - run: cd leaderboard; echo LB_VERSION=`/usr/bin/git log -1 --format='%h'` >> "$GITHUB_ENV"                                                                                                                   
+
+
         - uses: docker/login-action@v3
           with:
             registry: ${{ vars.WS_DOCKER_REGISTRY }}
@@ -110,7 +118,7 @@ jobs:
               docker compose -f docker-compose.build.yml --env-file tdei_uw.env push 
           env:
               ENV: ${{ vars.ENV }}
-              CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}"
+              CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}-${{ env.LB_VERSION }}"
               ENV_NAME_PARAM: ${{ env.ENV_NAME_PARAM }}
 
               # hosts
@@ -129,14 +137,14 @@ jobs:
         - name: Deploy
           env:
               ENV: ${{ vars.ENV }}
-              CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}"
+              CODE_VERSION: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}-${{ env.LB_VERSION }}"
               ENV_NAME_PARAM: ${{ env.ENV_NAME_PARAM }}
 
               # machine to deploy to 
               AZURE_DOCKER_HOST_IP: ${{ vars.AZURE_DOCKER_HOST_IP }}
 
               # tag to deploy
-              WS_DOCKER_TAG: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}"
+              WS_DOCKER_TAG: "${{ env.FRONTEND_VERSION }}-${{ env.CGIMAP_VERSION }}-${{ env.OSMRAILS_VERSION }}-${{ env.PATHWAYS_VERSION }}-${{ env.RAPID_VERSION }}-${{ env.TM_VERSION }}-${{ env.LB_VERSION }}"
 
               # hosts
               WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}

docker-compose.build.yml

@@ -130,3 +130,15 @@ services:
   tasks-backend_tag:
     extends: tasks-backend
     image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${CODE_VERSION}
+
+  leaderboard-frontend:
+
+  leaderboard-frontend_tag:
+    extends: leaderboard-frontend
+    image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:${CODE_VERSION}
+
+  leaderboard-backend:
+
+  leaderboard-backend_tag:
+    extends: leaderboard-backend
+    image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-backend:${CODE_VERSION}

docker-compose.deploy.yml

@@ -189,6 +189,28 @@ services:
       - traefik.http.routers.tasks-backend.entrypoints=websecure
       - traefik.http.routers.tasks-backend.tls.certresolver=myresolver
 
+  leaderboard-frontend:
+    image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:${WS_DOCKER_TAG}
+    ports:
+      - "80:80"
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.tasks-backend.rule=Host(`${LB_FRONTEND_HOST}`)
+      - traefik.http.services.tasks-backend.loadbalancer.server.port=80
+      - traefik.http.routers.tasks-backend.entrypoints=websecure
+      - traefik.http.routers.tasks-backend.tls.certresolver=myresolver
+
+  leaderboard-backend:
+    image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-backend:${WS_DOCKER_TAG}
+    ports:
+      - "5000:5000"
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.tasks-backend.rule=Host(`${LB_BACKEND_HOST}`)
+      - traefik.http.services.tasks-backend.loadbalancer.server.port=5000
+      - traefik.http.routers.tasks-backend.entrypoints=websecure
+      - traefik.http.routers.tasks-backend.tls.certresolver=myresolver
+
 volumes:
   osm-rails-tmp:
   osm-rails-storage:

docker-compose.yml

@@ -180,6 +180,16 @@ services:
       - traefik.http.services.workspaces-backend.loadbalancer.server.port=5000
       - traefik.http.routers.workspaces-backend.middlewares=workspaces-backend-emulation
 
+  leaderboard-frontend:
+    build:
+      context: ./leaderboard/frontend
+      dockerfile: Dockerfile
+
+  leaderboard-backend:
+    build:
+      context: ./leaderboard/backend
+      dockerfile: Dockerfile
+
 volumes:
   osm-rails-tmp:
   osm-rails-storage:

tdei_uw.env

@@ -34,6 +34,9 @@ WS_TDEI_API_URL=https://api${ENV_NAME_PARAM}.tdei.us/api/v1/
 WS_TDEI_OIDC_URL=https://account${ENV_NAME_PARAM}.tdei.us/
 WS_TDEI_OIDC_REALM=tdei
 
+LB_FRONTEND_HOST=leaderboard${ENV_NAME_PARAM}.sidewalks.washington.edu
+LB_BACKEND_HOST=api.leaderboard${ENV_NAME_PARAM}.sidewalks.washington.edu
+
 WS_FRONTEND_HOST=workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
 WS_API_HOST=api.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
 WS_RAPID_HOST=rapid.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu