Merge pull request #22 from TaskarCenterAtUW/stage

Merging changes to get stage working again back to dev

Author: jeffmaki

.github/workflows/build.yaml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest 
     name: Build, Push, Deploy
     environment: ${{ github.ref_name }} 
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
         - uses: actions/checkout@v2
           with:
@@ -55,9 +55,12 @@ jobs:
               docker compose -f docker-compose.build.yml --env-file tdei_uw.env push 
           env:
               ENV: ${{ vars.ENV }}
-              WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
               CODE_VERSION: ${{ github.sha }}
-              
+
+              # hosts
+              WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
+              WS_POSM_DB_HOST: ${{ vars.WS_POSM_DB_HOST }}
+
               # passwords
               WS_API_DB_PASS: ${{ secrets.WS_API_DB_PASS }}
               WS_MAPBOX_ACCESS_TOKEN: ${{ secrets.WS_MAPBOX_ACCESS_TOKEN }}
@@ -70,15 +73,18 @@ jobs:
         - name: Deploy
           env:
               ENV: ${{ vars.ENV }}
-              WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
               CODE_VERSION: ${{ github.sha }}
 
               # machine to deploy to 
               AZURE_DOCKER_HOST_IP: ${{ vars.AZURE_DOCKER_HOST_IP }}
 
               # tag to deploy
               WS_DOCKER_TAG: ${{ github.sha }}
-              
+
+              # hosts
+              WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
+              WS_POSM_DB_HOST: ${{ vars.WS_POSM_DB_HOST }}
+
               # passwords
               WS_API_DB_PASS: ${{ secrets.WS_API_DB_PASS }}
               WS_MAPBOX_ACCESS_TOKEN: ${{ secrets.WS_MAPBOX_ACCESS_TOKEN }}
@@ -115,4 +121,4 @@ jobs:
 
               echo Deploy list
               docker ps               
-       
+       

README.md

@@ -3,7 +3,9 @@
 ### Branch Strategy
 
 * **main**: day to day work goes here. 
-* **dev**: current code of the dev environment. No commits allowed directly; you'll need to open a PR from main. Committing/pushing here causes a deployment to the dev infrastructure. 
+* **dev**: current code of the dev environment. No commits allowed directly; you'll need to open a PR from main (or your feature branch). Committing/pushing here causes a deployment to the dev infrastructure. 
+* **stage**: current code of the stage environment. No commits allowed directly; you'll need to open a PR from dev. Committing/pushing here causes a deployment to the stage infrastructure. 
+* **prod**: current code of the prod environment. No commits allowed directly; you'll need to open a PR from stage. Committing/pushing here causes a deployment to the prod infrastructure. 
 
 ### GH Actions
 

tdei_uw.env

@@ -18,10 +18,10 @@ WS_PLATFORM_PRIVACY_POLICY=https://sidewalks.washington.edu/privacy
 # Web
 ###############################################################################
 
-WS_TDEI_FRONTEND_URL=https://tdei-usermanagement-web-${ENV}.azurewebsites.net/
-WS_TDEI_BACKEND_URL=https://tdei-usermanagement-be-${ENV}.azurewebsites.net/api/v1/
-WS_TDEI_API_URL=https://tdei-api-${ENV}.azurewebsites.net/api/v1/
-WS_TDEI_OIDC_URL=https://tdei-keycloak.azurewebsites.net/
+WS_TDEI_FRONTEND_URL=https://portal-${ENV}.tdei.us/
+WS_TDEI_BACKEND_URL=https://portal-api-${ENV}.tdei.us/api/v1/
+WS_TDEI_API_URL=https://api-${ENV}.tdei.us/api/v1/
+WS_TDEI_OIDC_URL=https://account-{$ENV}.tdei.us/
 WS_TDEI_OIDC_REALM=tdei
 
 WS_FRONTEND_HOST=workspaces-${ENV}.sidewalks.washington.edu
@@ -54,13 +54,13 @@ WS_API_DB_USER=workspaces
 WS_API_DB_PASS=${WS_API_DB_PASS}
 WS_API_DB_NAME=workspaces
 
-WS_OSM_DB_HOST=opensidewalks-${ENV}.postgres.database.azure.com
+WS_OSM_DB_HOST=${WS_POSM_DB_HOST}
 WS_OSM_DB_PORT=5432
 WS_OSM_DB_USER=workspaces-osm-${ENV}
 WS_OSM_DB_PASS=${WS_OSM_DB_PASS}
 WS_OSM_DB_NAME=workspaces-osm-${ENV}
 
-WS_TASKS_DB_HOST=opensidewalks-${ENV}.postgres.database.azure.com
+WS_TASKS_DB_HOST=${WS_POSM_DB_HOST}
 WS_TASKS_DB_PORT=5432
 WS_TASKS_DB_USER=workspaces-tasks-${ENV}
 WS_TASKS_DB_PASS=${WS_TASKS_DB_PASS}