From 19101465fa0f9a0047ab740e020ae8f17ff40421 Mon Sep 17 00:00:00 2001 From: Jeff Maki Date: Thu, 6 Mar 2025 18:31:48 -0500 Subject: [PATCH 1/7] Update build.yaml --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7f5e6ee..af07de3 100644 --- a/.github/workflows/build.yaml +++ b/.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: @@ -115,4 +115,4 @@ jobs: echo Deploy list docker ps - \ No newline at end of file + From 7fbf04cedf0c5f21b6a57bc6dbdfa920d6810029 Mon Sep 17 00:00:00 2001 From: Jeff Maki Date: Mon, 10 Mar 2025 17:37:27 -0400 Subject: [PATCH 2/7] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d67908..632b7d4 100644 --- a/README.md +++ b/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 From d6f63f96dfcf1d11d3f8053ddae78dff63d293b7 Mon Sep 17 00:00:00 2001 From: Jeff Maki Date: Thu, 13 Mar 2025 10:02:13 -0400 Subject: [PATCH 3/7] Allow POSM DB host to not be strictly tied to env name --- tdei_uw.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdei_uw.env b/tdei_uw.env index caae22a..81e569e 100644 --- a/tdei_uw.env +++ b/tdei_uw.env @@ -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} From 194cfa7909b2d467c7dad784f4072f1307369f26 Mon Sep 17 00:00:00 2001 From: Jeff Maki Date: Thu, 13 Mar 2025 10:14:38 -0400 Subject: [PATCH 4/7] Forgot to pass the GH vars to env vars --- .github/workflows/build.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index af07de3..f837255 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -55,8 +55,11 @@ 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 }} @@ -70,7 +73,6 @@ jobs: - name: Deploy env: ENV: ${{ vars.ENV }} - WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }} CODE_VERSION: ${{ github.sha }} # machine to deploy to @@ -78,7 +80,11 @@ jobs: # 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 }} From 5766d7753734aa24bef64074a5c23f420843ac1a Mon Sep 17 00:00:00 2001 From: Jeff Maki Date: Thu, 13 Mar 2025 10:17:43 -0400 Subject: [PATCH 5/7] Update build.yaml --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f837255..e2d8b08 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -56,11 +56,11 @@ jobs: env: ENV: ${{ vars.ENV }} 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 }} @@ -84,7 +84,7 @@ jobs: # 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 }} From 390fd1ae46675ff6d77fc1cde97135453f5ef89f Mon Sep 17 00:00:00 2001 From: Jeff Maki Date: Thu, 13 Mar 2025 10:30:58 -0400 Subject: [PATCH 6/7] Changing URLs of resources to be env tied --- tdei_uw.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tdei_uw.env b/tdei_uw.env index 81e569e..590c26a 100644 --- a/tdei_uw.env +++ b/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_FRONTEND_URL=https://portal-${ENV}.tdei.us/ +WS_TDEI_BACKEND_URL=https://portal-api-${ENV}.tdei.us/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_OIDC_URL=https://account-{$ENV}.tdei.us/ WS_TDEI_OIDC_REALM=tdei WS_FRONTEND_HOST=workspaces-${ENV}.sidewalks.washington.edu From f2179a1c02676d59d77411838e95aacb6f89ec69 Mon Sep 17 00:00:00 2001 From: Jeff Maki Date: Thu, 13 Mar 2025 10:39:22 -0400 Subject: [PATCH 7/7] Update tdei_uw.env --- tdei_uw.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdei_uw.env b/tdei_uw.env index 590c26a..2b74124 100644 --- a/tdei_uw.env +++ b/tdei_uw.env @@ -20,7 +20,7 @@ WS_PLATFORM_PRIVACY_POLICY=https://sidewalks.washington.edu/privacy 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://tdei-api-${ENV}.azurewebsites.net/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