From 22c15d15cb5fbc4c52dc878d7ec239398cf7a411 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:12:13 -0500
Subject: [PATCH 01/30] Update build.yaml

---
 .github/workflows/build.yaml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 550b66a..366de4c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,5 +1,10 @@
 name: "Release"
 on:
+  push:
+    branches:
+      - dev
+      - stage
+
   workflow_dispatch:
     inputs:
       build_flag:
@@ -13,9 +18,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest 
-    name: Build, Push, Deploy (dev)
-    environment: "dev"
-    timeout-minutes: 45
+    name: Build, Push, Deploy
+    environment: ${{ github.ref_name }} 
+    timeout-minutes: 20
     steps:
         - uses: actions/checkout@v2
           with:
@@ -88,8 +93,8 @@ jobs:
               ssh-add ~/.ssh/github_actions		  
 
               echo Configuring docker context
-              docker context create dev --docker "host=ssh://github-actions@${{ vars.AZURE_DOCKER_HOST_IP }}"
-              docker context use dev
+              docker context create ${{ vars.ENV }} --docker "host=ssh://github-actions@${{ vars.AZURE_DOCKER_HOST_IP }}"
+              docker context use ${{ vars.ENV }}
 
               # remove images no longer in use--may need disk space to pull
               echo Pruning old docker images

From e4719bf201c0dcb2bea324e902e880e8bcb716e7 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:14:40 -0500
Subject: [PATCH 02/30] Cleanup

---
 .github/build-v2-wip.yaml | 173 --------------------------------
 README.md                 |   6 +-
 docker-buildx.build.hcl   | 201 --------------------------------------
 3 files changed, 5 insertions(+), 375 deletions(-)
 delete mode 100644 .github/build-v2-wip.yaml
 delete mode 100644 docker-buildx.build.hcl

diff --git a/.github/build-v2-wip.yaml b/.github/build-v2-wip.yaml
deleted file mode 100644
index ed7bf37..0000000
--- a/.github/build-v2-wip.yaml
+++ /dev/null
@@ -1,173 +0,0 @@
-#
-#
-# This is work in progress! Goal: parallelize builds and cache docker layers. Ideally not rebuild images that have no changed commits, 
-# e.g. version each component separately vs. versioning all in one package based on workspaces-stack's version.
-#
-#
-
-
-name: "Release v2"
-on:
-  workflow_dispatch:
-    inputs:
-      environment:
-        description: 'Environment'     
-        required: true
-        default: 'dev'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest 
-    name: Build, Push, Deploy
-    environment: "dev"
-    timeout-minutes: 45
-    steps:
-        - uses: actions/checkout@v2
-          with:
-            submodules: recursive
-        
-#        - name: Generate release notes
-#          run:
-#              ./gen-rel-notes.sh > CHANGELOG
-
-        - name: Set commit SHA as code version
-          run: echo "CODE_VERSION=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-
-        - uses: docker/login-action@v3
-          with:
-            registry: ${{ vars.WS_DOCKER_REGISTRY }}
-            username: ${{ vars.DOCKERHUB_USERNAME }}
-            password: ${{ secrets.DOCKERHUB_TOKEN }}
-        
-        - uses: docker/setup-buildx-action@v3
-          name: Set up Docker Buildx
-                      
-        - name: Build frontend
-          uses: docker/build-push-action@v6
-          with:
-            context: ./frontend
-            push: true
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-frontend:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-frontend:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build osm-cgimap
-          uses: docker/build-push-action@v6
-          with:
-            context: ./osm-cgimap
-            push: true
-            file: ./osm-cgimap/docker/ubuntu/Dockerfile2404
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-cgimap:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-cgimap:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build osm-log-proxy
-          uses: docker/build-push-action@v6
-          with:
-            context: ./osm-log-proxy
-            push: true
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-log-proxy:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-log-proxy:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build osm-rails
-          uses: docker/build-push-action@v6
-          with:
-            context: ./osm-rails
-            push: true
-            file: ./osm-rails/Dockerfile.prod
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-rails:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-rails:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build osm-web
-          uses: docker/build-push-action@v6
-          with:
-            context: ./osm-web
-            push: true
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-web:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-osm-web:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build pathways-editor
-          uses: docker/build-push-action@v6
-          with:
-            context: ./pathways-editor
-            push: true
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-pathways-editor:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-pathways-editor:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build rapid
-          uses: docker/build-push-action@v6
-          with:
-            context: ./rapid
-            push: true
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-rapid:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-rapid:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build tasks-backend
-          uses: docker/build-push-action@v6
-          with:
-            context: ./tasking-manager
-            push: true
-            file: ./tasking-manager/scripts/docker/Dockerfile.backend
-            target: prod
-            build-args: |
-                APP_UID=1000
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-tasks-backend:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-tasks-backend:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Build tasks-frontend
-          uses: docker/build-push-action@v6
-          with:
-            context: ./tasking-manager
-            push: true
-            file: ./tasking-manager/scripts/docker/Dockerfile.frontend
-            build-args: |
-                TM_APP_API_URL="https://tasks.workspaces-${{ vars.ENV }}.sidewalks.washington.edu/"
-            tags: ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-tasks-frontend:${{ vars.ENV }}, ${{ vars.WS_DOCKER_REGISTRY }}/workspaces-tasks-frontend:${{ env.CODE_VERSION }}
-            cache-from: type=gha
-            cache-to: type=gha,mode=max
-
-        - name: Deploy
-          env:
-              ENV: ${{ vars.ENV }}
-              WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
-
-              # machine to deploy to 
-              AZURE_DOCKER_HOST_IP: ${{ vars.AZURE_DOCKER_HOST_IP }}
-
-              # tag to deploy
-              WS_DOCKER_TAG: ${{ env.CODE_VERSION }}
-              
-              # passwords
-              WS_API_DB_PASS: ${{ secrets.WS_API_DB_PASS }}
-              WS_MAPBOX_ACCESS_TOKEN: ${{ secrets.WS_MAPBOX_ACCESS_TOKEN }}
-              WS_OSM_DB_PASS: ${{ secrets.WS_OSM_DB_PASS }}
-              WS_OSM_SECRET_KEY_BASE: ${{ secrets.WS_OSM_SECRET_KEY_BASE }}
-              WS_SMTP_PASS: ${{ secrets.WS_SMTP_PASS }}
-              WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
-              WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
-          run: |
-            mkdir -p ~/.ssh
-              eval `ssh-agent -s`
-
-              ssh-keyscan ${{ vars.AZURE_DOCKER_HOST_IP }} >> ~/.ssh/known_hosts
-
-              echo "${{ secrets.GH_ACTIONS_SSH_KEY }}" > ~/.ssh/github_actions
-              chmod 600 ~/.ssh/github_actions
-              ssh-add ~/.ssh/github_actions		  
-
-              docker context create dev --docker "host=ssh://github-actions@${{ vars.AZURE_DOCKER_HOST_IP }}"
-              docker context use dev
-
-              # remove images no longer in use--may need disk space to pull
-              docker image prune -a -f
-
-              # pull new images, recreate containers
-              docker compose -f docker-compose.deploy.yml --env-file tdei_uw.env up -d --force-recreate --remove-orphans
-
-    
\ No newline at end of file
diff --git a/README.md b/README.md
index cc360df..ae02f7a 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
 
 ```docker-compose -f docker-compose.build.yml --env-file XXX.env build```
 
-```docker-compose --env-file XXX.env push```
+```docker-compose -f docker-compose.build.yml push```
 
 Replace XXX.env with the environment definition file of the environment for which you want to build an image. This can be overridden when running (see below). 
 
@@ -37,3 +37,7 @@ Replace XXX.env with the environment definition file of the environment for whic
 
 * ```example.env```: template of the .env file required by the Docker compose YAML files
 * ```tdei_uw.env```: .env for deployment at UW's TDEI center. Only UW should use this, new users should adapt example.env to suit their needs. LTG: remove this file from this repo. 
+
+# GH Actions
+
+See GitHub's actions tab in this repo for more deployment examples/steps. 
\ No newline at end of file
diff --git a/docker-buildx.build.hcl b/docker-buildx.build.hcl
deleted file mode 100644
index 42a05da..0000000
--- a/docker-buildx.build.hcl
+++ /dev/null
@@ -1,201 +0,0 @@
-group "default" {
-    targets = [
-        "osm-web",
-        "pathways-editor",
-        "rapid",
-        "osm-cgimap",
-        "frontend",
-        "tasks-frontend",
-        "tasks-backend",
-        "osm-log-proxy",
-        "osm-rails"
-    ]
-}
-
-variable "WS_DOCKER_REGISTRY" {
-    default = "opensidewalksdev.azurecr.io"
-}
-
-variable "ENV" {
-    default = "dev"
-}
-    
-variable "CODE_VERSION" {
-    default = "0"
-}
-
-variable "VITE_API_URL" {
-    default = "https://api.workspaces-${ENV}.sidewalks.washington.edu/api/v1/"
-}
-
-variable "VITE_OSM_URL" {
-    default = "https://osm.workspaces-${ENV}.sidewalks.washington.edu/"
-}
-
-variable "VITE_PATHWAYS_EDITOR_URL" {
-    default = "https://pathways.workspaces-${ENV}.sidewalks.washington.edu/"
-}
-
-variable "VITE_RAPID_URL" {
-    default = "https://rapid.workspaces-${ENV}.sidewalks.washington.edu/"
-}
-
-variable "VITE_TDEI_API_URL" {
-    default = "https://tdei-api-${ENV}.azurewebsites.net/api/v1/"
-}
-
-variable "VITE_TDEI_USER_API_URL" {
-    default = "https://tdei-usermanagement-be-${ENV}.azurewebsites.net/api/v1/"
-}
-
-target "frontend" {
-    context = "frontend"
-    dockerfile = "Dockerfile"
-#    args = {
-#      CODE_VERSION = ${CODE_VERSION}
-#      VITE_API_URL = ${VITE_API_URL}
-#      VITE_OSM_URL = ${VITE_OSM_URL}
-#      VITE_PATHWAYS_EDITOR_URL = ${VITE_PATHWAYS_EDITOR_URL}
-#      VITE_RAPID_URL = ${VITE_RAPID_URL}
-#      VITE_TDEI_API_URL = ${VITE_TDEI_API_URL}
-#      VITE_TDEI_USER_API_URL = ${VITE_TDEI_USER_API_URL}
-#    }  
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-frontend:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-frontend:${CODE_VERSION}"
-    ]
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
- 
-}
-
-target "osm-cgimap" {
-    context = "osm-cgimap"
-    dockerfile = "docker/ubuntu/Dockerfile2404"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${CODE_VERSION}"
-    ]
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
-
-target "osm-log-proxy" {
-    context = "osm-log-proxy"
-    dockerfile = "Dockerfile"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:${CODE_VERSION}"
-    ]
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
-
-target "osm-rails" {
-    context = "osm-rails"
-    dockerfile = "Dockerfile.prod"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-rails:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-rails:${CODE_VERSION}"
-    ]
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
-
-target "osm-web" {
-    context = "osm-web"
-    dockerfile = "Dockerfile"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-web:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-osm-web:${CODE_VERSION}"
-    ]
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
-
-target "pathways-editor" {
-    context = "pathways-editor"
-    dockerfile = "Dockerfile"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:${CODE_VERSION}"
-    ]
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
-
-target "rapid" {
-    context = "rapid"
-    dockerfile = "Dockerfile"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-rapid:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-rapid:${CODE_VERSION}"
-    ]
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
-
-target "tasks-backend" {
-    context = "tasking-manager"
-    dockerfile = "./scripts/docker/Dockerfile.backend"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${CODE_VERSION}"
-    ]
-    target = "prod"
-    args = {
-      APP_UID = "1000"
-    }
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
-
-target "tasks-frontend" {
-    context = "tasking-manager"
-    dockerfile = "./scripts/docker/Dockerfile.frontend"
-    tags = [
-        "${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${ENV}",
-        "${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${CODE_VERSION}"
-    ]
-    args = {
-      TM_APP_API_URL = "https://tasks.workspaces-${ENV}.sidewalks.washington.edu/"
-    }
-    cache-to = [
-        "type=gha"
-    ]    
-    cache-from = [
-        "type=gha"
-    ]    
-}
\ No newline at end of file

From 77d942471297bf3567a6767e297e07ce1a3a082a Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:16:28 -0500
Subject: [PATCH 03/30] Update build.yaml

---
 .github/workflows/build.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 366de4c..a740306 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,9 +36,9 @@ jobs:
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
-              fromTag: "0.1"
               toTag: ${{ github.sha }}
               mode: "HYBRID"
+              outputFile: "CHANGELOG.md"
 
         - name: Set up Docker Buildx
           uses: docker/setup-buildx-action@v3
@@ -61,6 +61,9 @@ jobs:
               WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
               WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
 
+        - name: Print CHANGELOG.md
+          run: cat CHANGELOG.md
+
         - name: Deploy
           env:
               ENV: ${{ vars.ENV }}

From a842ce2a427dc119bcac02c978103588a52e8d6c Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:22:01 -0500
Subject: [PATCH 04/30] Update build.yaml

---
 .github/workflows/build.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a740306..d74cc9b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,7 +36,8 @@ jobs:
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
-              toTag: ${{ github.sha }}
+              fromTag: "@~"
+              toTag: "@"
               mode: "HYBRID"
               outputFile: "CHANGELOG.md"
 

From bea3867881ded25669df70b2fcb38c1f9367fe57 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:42:27 -0500
Subject: [PATCH 05/30] Update build.yaml

---
 .github/workflows/build.yaml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d74cc9b..e328fd9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,11 +36,14 @@ jobs:
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
-              fromTag: "@~"
-              toTag: "@"
-              mode: "HYBRID"
+              fromTag: "@~" # last commit
+              toTag: "@" # this commit
+              mode: "PR"
               outputFile: "CHANGELOG.md"
 
+        - name: Print CHANGELOG.md
+          run: cat CHANGELOG.md
+
         - name: Set up Docker Buildx
           uses: docker/setup-buildx-action@v3
                                                                                                                    
@@ -62,9 +65,6 @@ jobs:
               WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
               WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
 
-        - name: Print CHANGELOG.md
-          run: cat CHANGELOG.md
-
         - name: Deploy
           env:
               ENV: ${{ vars.ENV }}
@@ -113,5 +113,11 @@ jobs:
 
               echo Deploy list
               docker ps 
-
-    
\ No newline at end of file
+              
+              - uses: actions/upload-artifact@v4
+              
+        - name: Release changelog
+          uses: actions/upload-artifact@v4
+          with:
+            name: "${{ github.sha }} Changelog"
+            path: CHANGELOG.md        

From 69e6ce2fec783a8c1d760ea250d9f7872fb2a10c Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:49:27 -0500
Subject: [PATCH 06/30] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e328fd9..76e9e82 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,7 +36,7 @@ jobs:
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
-              fromTag: "@~" # last commit
+              fromTag: "@~2" # last commit
               toTag: "@" # this commit
               mode: "PR"
               outputFile: "CHANGELOG.md"

From 78b44f413f7f1abc7d06249ded83127123744b1e Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:51:03 -0500
Subject: [PATCH 07/30] Update build.yaml

---
 .github/workflows/build.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 76e9e82..42cc8f1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -65,6 +65,12 @@ jobs:
               WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
               WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
 
+        - name: Release changelog
+          uses: actions/upload-artifact@v4
+          with:
+            name: "${{ github.sha }} Changelog"
+            path: CHANGELOG.md        
+
         - name: Deploy
           env:
               ENV: ${{ vars.ENV }}
@@ -116,8 +122,4 @@ jobs:
               
               - uses: actions/upload-artifact@v4
               
-        - name: Release changelog
-          uses: actions/upload-artifact@v4
-          with:
-            name: "${{ github.sha }} Changelog"
-            path: CHANGELOG.md        
+       
\ No newline at end of file

From 145f5b7555a213cfe67fd70bc2d6dc092c2183f5 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 14:57:41 -0500
Subject: [PATCH 08/30] Update build.yaml

---
 .github/workflows/build.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 42cc8f1..42be7d0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -118,8 +118,5 @@ jobs:
               sleep 30s 
 
               echo Deploy list
-              docker ps 
-              
-              - uses: actions/upload-artifact@v4
-              
+              docker ps               
        
\ No newline at end of file

From 02798e1194857ff795d41211429c0065df5c69c9 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 15:00:47 -0500
Subject: [PATCH 09/30] Update build.yaml

---
 .github/workflows/build.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 42be7d0..08c2615 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -32,13 +32,16 @@ jobs:
             username: ${{ vars.DOCKERHUB_USERNAME }}
             password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+        - name: Get last tag
+          run: echo "TAG_LAST=$(git describe --tags --abbrev=0" >> $GITHUB_ENV
+
         - name: "Build Changelog"
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
-              fromTag: "@~2" # last commit
-              toTag: "@" # this commit
-              mode: "PR"
+              fromTag: "${{ env.TAG_LAST }}"
+              toTag: "${{ github.ref }}"
+              mode: "HYBRID"
               outputFile: "CHANGELOG.md"
 
         - name: Print CHANGELOG.md

From 898372b9d6a77957f59721cc3f0b65c80d1bed52 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 15:04:32 -0500
Subject: [PATCH 10/30] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 08c2615..9d4a8a2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
             password: ${{ secrets.DOCKERHUB_TOKEN }}
 
         - name: Get last tag
-          run: echo "TAG_LAST=$(git describe --tags --abbrev=0" >> $GITHUB_ENV
+          run: echo "TAG_LAST=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
 
         - name: "Build Changelog"
           id: build_changelog

From efe6da6a50ca3cde4f0b3c308dff33ebe91f94fb Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 15:06:30 -0500
Subject: [PATCH 11/30] Update build.yaml

---
 .github/workflows/build.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9d4a8a2..ce1b165 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -39,8 +39,6 @@ jobs:
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
-              fromTag: "${{ env.TAG_LAST }}"
-              toTag: "${{ github.ref }}"
               mode: "HYBRID"
               outputFile: "CHANGELOG.md"
 

From 405944cfbda74af6aa4ac509bb3b53417a7ea356 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 15:11:14 -0500
Subject: [PATCH 12/30] Update build.yaml

---
 .github/workflows/build.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ce1b165..2727f7d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -39,6 +39,7 @@ jobs:
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
+              toTag: "${{ github.ref }}"
               mode: "HYBRID"
               outputFile: "CHANGELOG.md"
 

From 46b7a60ae5abbc2a258a590f388e1c861c902f66 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 15:18:08 -0500
Subject: [PATCH 13/30] Update build.yaml

---
 .github/workflows/build.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2727f7d..d22fcd4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,6 +26,9 @@ jobs:
           with:
             submodules: recursive
         
+        - name: Get tags
+          run: git fetch --tags
+                
         - uses: docker/login-action@v3
           with:
             registry: ${{ vars.WS_DOCKER_REGISTRY }}

From 314e77569b8a675035e29e07e157a29b353041f9 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 15:21:33 -0500
Subject: [PATCH 14/30] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d22fcd4..6aad9c3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,7 +36,7 @@ jobs:
             password: ${{ secrets.DOCKERHUB_TOKEN }}
 
         - name: Get last tag
-          run: echo "TAG_LAST=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+          run: echo "TAG_LAST=$(git describe --tags --abbrev=0 --always)" >> $GITHUB_ENV
 
         - name: "Build Changelog"
           id: build_changelog

From fd6b7fa1d315154a600297cf1c0853cf056c8a0c Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 15:34:15 -0500
Subject: [PATCH 15/30] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6aad9c3..4c75466 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -73,7 +73,7 @@ jobs:
         - name: Release changelog
           uses: actions/upload-artifact@v4
           with:
-            name: "${{ github.sha }} Changelog"
+            name: "Changelog"
             path: CHANGELOG.md        
 
         - name: Deploy

From fa19254e06f5db3cc8d46fa076887a6a815be0a9 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 16:35:25 -0500
Subject: [PATCH 16/30] Update build.yaml

---
 .github/workflows/build.yaml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4c75466..170382e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,23 +26,20 @@ jobs:
           with:
             submodules: recursive
         
-        - name: Get tags
-          run: git fetch --tags
-                
         - uses: docker/login-action@v3
           with:
             registry: ${{ vars.WS_DOCKER_REGISTRY }}
             username: ${{ vars.DOCKERHUB_USERNAME }}
             password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-        - name: Get last tag
-          run: echo "TAG_LAST=$(git describe --tags --abbrev=0 --always)" >> $GITHUB_ENV
+#        - name: Get last tag
+#          run: echo "TAG_LAST=$(git describe --tags --abbrev=0 --always)" >> $GITHUB_ENV
 
         - name: "Build Changelog"
           id: build_changelog
           uses: mikepenz/release-changelog-builder-action@v5
           with:
-              toTag: "${{ github.ref }}"
+#              toTag: "${{ github.ref }}"
               mode: "HYBRID"
               outputFile: "CHANGELOG.md"
 
@@ -70,12 +67,6 @@ jobs:
               WS_TASKS_DB_PASS: ${{ secrets.WS_TASKS_DB_PASS }}
               WS_TASKS_SECRET_KEY: ${{ secrets.WS_TASKS_SECRET_KEY }}
 
-        - name: Release changelog
-          uses: actions/upload-artifact@v4
-          with:
-            name: "Changelog"
-            path: CHANGELOG.md        
-
         - name: Deploy
           env:
               ENV: ${{ vars.ENV }}

From fd97ff36d38f1e0baf5674084342d5e95af8b9a5 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 16:38:28 -0500
Subject: [PATCH 17/30] Update build.yaml

---
 .github/workflows/build.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 170382e..7f5e6ee 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,16 +35,16 @@ jobs:
 #        - name: Get last tag
 #          run: echo "TAG_LAST=$(git describe --tags --abbrev=0 --always)" >> $GITHUB_ENV
 
-        - name: "Build Changelog"
-          id: build_changelog
-          uses: mikepenz/release-changelog-builder-action@v5
-          with:
+#        - name: "Build Changelog"
+#          id: build_changelog
+#          uses: mikepenz/release-changelog-builder-action@v5
+#          with:
 #              toTag: "${{ github.ref }}"
-              mode: "HYBRID"
-              outputFile: "CHANGELOG.md"
+#              mode: "HYBRID"
+#              outputFile: "CHANGELOG.md"
 
-        - name: Print CHANGELOG.md
-          run: cat CHANGELOG.md
+#        - name: Print CHANGELOG.md
+#          run: cat CHANGELOG.md
 
         - name: Set up Docker Buildx
           uses: docker/setup-buildx-action@v3

From b3d12a0a5fec276a5a00dcb43cd71ef7ba54ebef Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 17:35:02 -0500
Subject: [PATCH 18/30] Update README.md

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ae02f7a..d056a99 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
 # Contents of This Repo
 
+## 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. 
+
 ## Frontend Tier
 * ```frontend```: The Workspaces frontend (VueJS app).
   * Code here: https://github.com/TaskarCenterAtUW/workspaces-frontend.
@@ -40,4 +45,4 @@ Replace XXX.env with the environment definition file of the environment for whic
 
 # GH Actions
 
-See GitHub's actions tab in this repo for more deployment examples/steps. 
\ No newline at end of file
+See GitHub's actions tab in this repo for more deployment examples/steps. 

From ff8978e8d7baff8c21f2c93f60f740f4ccd6a52d Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 20 Feb 2025 17:36:21 -0500
Subject: [PATCH 19/30] Update README.md

---
 README.md | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index d056a99..c71d972 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,17 @@
-# Contents of This Repo
+# Dev Standards
 
-## Branch Strategy
+### 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. 
 
-## Frontend Tier
+### GH Actions
+
+See GitHub's actions tab in this repo for more deployment examples/steps. 
+
+# System Overview
+
+### Frontend Tier
 * ```frontend```: The Workspaces frontend (VueJS app).
   * Code here: https://github.com/TaskarCenterAtUW/workspaces-frontend.
   * Uses the other components within this repo, e.g. ```osm-rails```, ```osm-cgimap``` and ```tasking-manager``` as an API backend.
@@ -15,14 +21,16 @@
     * Workspaces version in the ```workspaces``` branch. Need to pull from public version periodically to keep up to date. 
     * Public version: tries to be a match to ```main``` of upstream. 
 
-## Backend Tier
+### Backend Tier
 * ```osm-web```: Reverse proxy that dispatches requests to osm-cgimap or osm-rails depending on performance requirements.   
   * ```osm-log-proxy```: sits in front of the below two services, logs requests for debugging purposes.
     * ```osm-rails```: “reference implementation” for OSM API for editing. Slow.
     * ```osm-cgimap```: Faster version of osm-rails. API format the same as osm-rails. Only some functions of osm-rails. 
 * ```tasking-manager```: Not currently using, but task manager for OSM. 
-  
-# To build images
+
+# Getting Started
+
+### To build images
 
 ```git clone --recursive https://github.com/TaskarCenterAtUW/workspaces-stack.git```
 
@@ -32,17 +40,14 @@
 
 Replace XXX.env with the environment definition file of the environment for which you want to build an image. This can be overridden when running (see below). 
 
-# To update docker daemon to run with latest images
+### To update docker daemon to run with latest images
 
 ```docker-compose -f docker-compose.deploy.yml --env-file XXX.env up -d -pull always --force-recreate --remove-orphans```
 
 Replace XXX.env with the environment definition file of the environment for which you are deploying.
 
-# Other Files
+### Other Files
 
 * ```example.env```: template of the .env file required by the Docker compose YAML files
 * ```tdei_uw.env```: .env for deployment at UW's TDEI center. Only UW should use this, new users should adapt example.env to suit their needs. LTG: remove this file from this repo. 
 
-# GH Actions
-
-See GitHub's actions tab in this repo for more deployment examples/steps. 

From be9ee0e3d42bf444c7cffd82ae7b0d6bc13512ef Mon Sep 17 00:00:00 2001
From: uwjohnbee <johnbee@uw.edu>
Date: Mon, 3 Mar 2025 12:27:54 -0800
Subject: [PATCH 20/30] Adding section to README for local development

---
 README.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c71d972..7fff33f 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ See GitHub's actions tab in this repo for more deployment examples/steps.
 
 # Getting Started
 
-### To build images
+### To build images for deploy
 
 ```git clone --recursive https://github.com/TaskarCenterAtUW/workspaces-stack.git```
 
@@ -49,5 +49,50 @@ Replace XXX.env with the environment definition file of the environment for whic
 ### Other Files
 
 * ```example.env```: template of the .env file required by the Docker compose YAML files
-* ```tdei_uw.env```: .env for deployment at UW's TDEI center. Only UW should use this, new users should adapt example.env to suit their needs. LTG: remove this file from this repo. 
+* ```tdei_uw.env```: .env for deployment at UW's TDEI center. Only UW should use this, new users should adapt example.env to suit their needs. LTG: remove this file from this repo.
 
+# Local Development
+
+### To build images for local development
+
+You will need access to prepopulated .env files that are not in version control.  Specifically local.dev.env for the rest of these steps, which is assumed to be found in the workspaces-stack root directory.
+
+Add (or merge) the following to your ```/etc/hosts``` file:
+```127.0.0.1	localhost workspaces.local api.workspaces.local rapid.workspaces.local osm.workspaces.local pathways.workspaces.local tasks.workspaces.local```
+
+You will also need to increase the total amount of system memory available to Docker containers to 10+ GB.  In Docker Desktop you find this in Settings -> Resources -> Memory Limit.
+
+```git clone --recursive https://github.com/TaskarCenterAtUW/workspaces-stack.git```
+
+Comment out the ```osm-log-proxy``` section from ```docker-compose.yml``` as aggregate logging is not available locally.
+
+```docker-compose build```
+
+```cp local.dev.env .env```
+
+```docker-compose up -d```
+
+Now we are ready to finalize configuration on each container.
+
+```docker-compose run --rm --entrypoint=bash frontend```
+```npm i```
+```exit```
+
+```docker-compose run --rm --entrypoint=bash rapid```
+```npm i```
+```exit```
+
+```docker-compose run --rm --entrypoint=bash pathways-editor```
+```npm i```
+```exit```
+
+```docker-compose run --rm --entrypoint=bash osm-rails```
+```cp /config/example.storage.yml /config/storage.yml```
+```bundle install```
+```exit```
+
+Note that there are two different ways to run individual containers depending on your dev context.
+
+Using the frontend container as an example:
+* To debug / step through run ```docker-compose run --rm frontend```
+* To run while working on another service run ```docker-compose up -d frontend```

From 58f62330eb23c6e2d1b3a5e294ea91e7df37ed3b Mon Sep 17 00:00:00 2001
From: uwjohnbee <johnbee@uw.edu>
Date: Mon, 3 Mar 2025 13:13:06 -0800
Subject: [PATCH 21/30] Format fixes for markdown syntax

---
 README.md | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 7fff33f..7d67908 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ Replace XXX.env with the environment definition file of the environment for whic
 You will need access to prepopulated .env files that are not in version control.  Specifically local.dev.env for the rest of these steps, which is assumed to be found in the workspaces-stack root directory.
 
 Add (or merge) the following to your ```/etc/hosts``` file:
+
 ```127.0.0.1	localhost workspaces.local api.workspaces.local rapid.workspaces.local osm.workspaces.local pathways.workspaces.local tasks.workspaces.local```
 
 You will also need to increase the total amount of system memory available to Docker containers to 10+ GB.  In Docker Desktop you find this in Settings -> Resources -> Memory Limit.
@@ -67,29 +68,37 @@ You will also need to increase the total amount of system memory available to Do
 Comment out the ```osm-log-proxy``` section from ```docker-compose.yml``` as aggregate logging is not available locally.
 
 ```docker-compose build```
-
+  
 ```cp local.dev.env .env```
-
+  
 ```docker-compose up -d```
 
 Now we are ready to finalize configuration on each container.
 
-```docker-compose run --rm --entrypoint=bash frontend```
-```npm i```
-```exit```
-
-```docker-compose run --rm --entrypoint=bash rapid```
-```npm i```
-```exit```
-
-```docker-compose run --rm --entrypoint=bash pathways-editor```
-```npm i```
-```exit```
-
-```docker-compose run --rm --entrypoint=bash osm-rails```
-```cp /config/example.storage.yml /config/storage.yml```
-```bundle install```
-```exit```
+```
+docker-compose run --rm --entrypoint=bash frontend
+npm i
+exit
+```  
+
+```
+docker-compose run --rm --entrypoint=bash rapid
+npm i
+exit
+```  
+
+```
+docker-compose run --rm --entrypoint=bash pathways-editor
+npm i
+exit
+```  
+
+```
+docker-compose run --rm --entrypoint=bash osm-rails
+cp /config/example.storage.yml /config/storage.yml
+bundle install
+exit
+```  
 
 Note that there are two different ways to run individual containers depending on your dev context.
 

From 12fdbb599af66a1035f419646c7acf2f68f3bb7a Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 6 Mar 2025 18:08:09 -0500
Subject: [PATCH 22/30] Update frontend

---
 frontend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend b/frontend
index 3a6c4ee..ba86376 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit 3a6c4ee8010e425fd0cbeebeb733763a8674c382
+Subproject commit ba86376278cdad9c666ed8f111fe38393a5db7c9

From 19101465fa0f9a0047ab740e020ae8f17ff40421 Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Thu, 6 Mar 2025 18:31:48 -0500
Subject: [PATCH 23/30] 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 <hello@jeffmaki.com>
Date: Mon, 10 Mar 2025 17:37:27 -0400
Subject: [PATCH 24/30] 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 <hello@jeffmaki.com>
Date: Thu, 13 Mar 2025 10:02:13 -0400
Subject: [PATCH 25/30] 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 <hello@jeffmaki.com>
Date: Thu, 13 Mar 2025 10:14:38 -0400
Subject: [PATCH 26/30] 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 <hello@jeffmaki.com>
Date: Thu, 13 Mar 2025 10:17:43 -0400
Subject: [PATCH 27/30] 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 <hello@jeffmaki.com>
Date: Thu, 13 Mar 2025 10:30:58 -0400
Subject: [PATCH 28/30] 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 <hello@jeffmaki.com>
Date: Thu, 13 Mar 2025 10:39:22 -0400
Subject: [PATCH 29/30] 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
 

From 0d24afd0e752064b39e0f9a0d6eb480f17efe06f Mon Sep 17 00:00:00 2001
From: Jeff Maki <hello@jeffmaki.com>
Date: Tue, 18 Mar 2025 14:38:35 -0400
Subject: [PATCH 30/30] Update frontend repo pointer to
 workspaces-frontend/master

---
 frontend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend b/frontend
index ba86376..275ae3e 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit ba86376278cdad9c666ed8f111fe38393a5db7c9
+Subproject commit 275ae3e43b65007b3a54c752480304fe5dfa13c8