From 39cc15a19b4fd12bdd694180e9bde9decce8ab31 Mon Sep 17 00:00:00 2001
From: Jared Trouth <74978887+jtrouth@users.noreply.github.com>
Date: Thu, 17 Oct 2024 09:18:16 -0500
Subject: [PATCH 1/3] K8s updates (#280)

---
 .github/workflows/build-and-push.yaml | 1 +
 Dockerfile                            | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index b23ff5ab..9fdf5e59 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -88,6 +88,7 @@ jobs:
             type=gha
           build-args: |
             BASE_TAG=k8s
+            RUN_BUILD=false
       - name: Summary
         run: |
           cat <<-EOT >> "$GITHUB_STEP_SUMMARY"
diff --git a/Dockerfile b/Dockerfile
index 6f253fc6..8cf58eab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,12 @@ ARG CRAFT_SECRET_TOKEN
 ARG CRAFT_EDUCATOR_SCHEMA_SECRET_TOKEN
 ARG CRAFT_STUDENT_SCHEMA_SECRET_TOKEN
 
-RUN npx browserslist@latest --update-db && yarn static:build
+RUN npx browserslist@latest --update-db
+
+ARG RUN_BUILD="true"
+ENV RUN_BUILD=${RUN_BUILD}
+
+RUN if $RUN_BUILD;then yarn static:build;fi
 
 # Production image, copy all the files and run next
 FROM node:20-alpine AS runner

From 888160f780e9c0b7e28f6d98860b09ef689d473a Mon Sep 17 00:00:00 2001
From: Jack Rosati <168000881+jrosati-burwood@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:40:33 -0500
Subject: [PATCH 2/3] Bugfix/workflow branch (#286)

Co-authored-by: Jared Trouth <74978887+jtrouth@users.noreply.github.com>
---
 .github/workflows/build-and-push.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index 9fdf5e59..6955cffe 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -5,6 +5,7 @@ on:
     branches:
       - "develop"
       - "master"
+      - 'main'
     tags:
       - "v*"
 

From 9f33960ac1bfa8d3cdc20320c83cb2b6e8403eb1 Mon Sep 17 00:00:00 2001
From: Jack Rosati <168000881+jrosati-burwood@users.noreply.github.com>
Date: Mon, 21 Oct 2024 13:27:56 -0500
Subject: [PATCH 3/3] change app name for k8s image (#288)

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

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index 6955cffe..90242fe3 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -112,7 +112,7 @@ jobs:
             api.image.repository=${{ needs.build.outputs.image_name }}
           )
           DATA="{
-            \"app_name\": \"investigations-client\",
+            \"app_name\": \"investigations\",
             \"environment_name\": \"${{ needs.build.outputs.environment_name }}\",
             \"parameters\": $(jq -c -n '$ARGS.positional' --args ${PARAMETERS[@]})
           }"