From ccc678878e3d7c5c2bdb77494931519a6097d6b5 Mon Sep 17 00:00:00 2001
From: lineshr <linesh.raghawan@digdir.no>
Date: Fri, 14 Nov 2025 12:42:07 +0100
Subject: [PATCH 1/5] =?UTF-8?q?MP-847=20sak=20for=20st=C3=B8tte=20ny=20map?=
 =?UTF-8?q?pa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-k6-build-publish-docker.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test-k6-build-publish-docker.yml b/.github/workflows/test-k6-build-publish-docker.yml
index 19087d00..7cdc6bfa 100644
--- a/.github/workflows/test-k6-build-publish-docker.yml
+++ b/.github/workflows/test-k6-build-publish-docker.yml
@@ -84,6 +84,10 @@ jobs:
       - name: Build the tagged Docker image
         run: docker build --tag ${{env.IMAGE_NAME}}:${{env.IMAGETAG}} docker/
 
+      - name: Build the tagged Docker image for ny image
+        run: docker build --tag ${{env.IMAGE_NAME}}:${{env.IMAGETAG}} docker-new/
+
+
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # pin@v0.33.1
         id: trivy-primary

From 4465b270c5905c4ecb82f19dfd6b3a97b756cbbf Mon Sep 17 00:00:00 2001
From: lineshr <linesh.raghawan@digdir.no>
Date: Fri, 14 Nov 2025 14:21:17 +0100
Subject: [PATCH 2/5] =?UTF-8?q?MP-847=20sak=20for=20st=C3=B8tte=20ny=20map?=
 =?UTF-8?q?pa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/test-k6-build-publish-docker.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-k6-build-publish-docker.yml b/.github/workflows/test-k6-build-publish-docker.yml
index 7cdc6bfa..6c3972ba 100644
--- a/.github/workflows/test-k6-build-publish-docker.yml
+++ b/.github/workflows/test-k6-build-publish-docker.yml
@@ -81,12 +81,16 @@ jobs:
           cp -R ${{ inputs.k6-jwt-folder }}/* docker/${{ inputs.k6-jwt-folder }}/
           mkdir docker/${{ inputs.k6-docker-folder }}
           cp -R ${{ inputs.k6-docker-folder }}/* docker/${{ inputs.k6-docker-folder }}/
-      - name: Build the tagged Docker image
-        run: docker build --tag ${{env.IMAGE_NAME}}:${{env.IMAGETAG}} docker/
 
-      - name: Build the tagged Docker image for ny image
-        run: docker build --tag ${{env.IMAGE_NAME}}:${{env.IMAGETAG}} docker-new/
+      # Build docker-new/ only when IMAGE_NAME contains "new-maskinporten-tests"
+      - name: Build the tagged Docker image for new-demo-tests
+        if: contains(env.IMAGE_NAME, 'new-maskinporten-tests')
+        run: docker build --tag "${{ env.IMAGE_NAME }}:${{ env.IMAGETAG }}" docker-new/
 
+      # Build docker/ for everything else
+      - name: Build the tagged Docker image
+        if: "!contains(env.IMAGE_NAME, 'new-maskinporten-tests')"
+        run: docker build --tag "${{ env.IMAGE_NAME }}:${{ env.IMAGETAG }}" docker/
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # pin@v0.33.1

From 42ea6cd3766245779f9a2d4134d98c1207ad3000 Mon Sep 17 00:00:00 2001
From: LRaghawan <linesh.raghawan@digdir.no>
Date: Fri, 14 Nov 2025 14:28:55 +0100
Subject: [PATCH 3/5] Create pull_request_template.md

---
 .github/pull_request_template.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..6411d87f
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+SAK:
+ID-xxxx
+
+Sjekklister:  
+Eigar:
+
+- [ ] Vurdert breaking changes
+- [ ] Avhengigheter til andre saker avklart
+- [ ] Testet mot en eller flere tjenester som bruker biblioteket
+- [ ] Unngått å legge til unødvendige avhengigheter
+- [ ] Har oppdatert dependabots
+
+Kodeles:
+
+- [ ] Lesbar kode, nødvendige kommentarer
+- [ ] Sak er godt nok forklart/dokumentert
+- [ ] Løyser saka
+- [ ] Risikovurdering ok
+- [ ] Nødvendige unit-tester er på plass
+- [ ] Har oppdatert readme 

From 0ec0aa67d70e4d49e9309c3a662f719e304d9e79 Mon Sep 17 00:00:00 2001
From: LRaghawan <linesh.raghawan@digdir.no>
Date: Fri, 14 Nov 2025 14:34:44 +0100
Subject: [PATCH 4/5] Delete .github/pull_request_template.md

---
 .github/pull_request_template.md | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 6411d87f..00000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,20 +0,0 @@
-SAK:
-ID-xxxx
-
-Sjekklister:  
-Eigar:
-
-- [ ] Vurdert breaking changes
-- [ ] Avhengigheter til andre saker avklart
-- [ ] Testet mot en eller flere tjenester som bruker biblioteket
-- [ ] Unngått å legge til unødvendige avhengigheter
-- [ ] Har oppdatert dependabots
-
-Kodeles:
-
-- [ ] Lesbar kode, nødvendige kommentarer
-- [ ] Sak er godt nok forklart/dokumentert
-- [ ] Løyser saka
-- [ ] Risikovurdering ok
-- [ ] Nødvendige unit-tester er på plass
-- [ ] Har oppdatert readme 

From 394e8843da95b013d1c67a18f1574ff9453dc387 Mon Sep 17 00:00:00 2001
From: LRaghawan <linesh.raghawan@digdir.no>
Date: Fri, 14 Nov 2025 14:53:28 +0100
Subject: [PATCH 5/5] Update test-k6-build-publish-docker.yml

---
 .github/workflows/test-k6-build-publish-docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-k6-build-publish-docker.yml b/.github/workflows/test-k6-build-publish-docker.yml
index 6c3972ba..ea8cd203 100644
--- a/.github/workflows/test-k6-build-publish-docker.yml
+++ b/.github/workflows/test-k6-build-publish-docker.yml
@@ -89,7 +89,7 @@ jobs:
 
       # Build docker/ for everything else
       - name: Build the tagged Docker image
-        if: "!contains(env.IMAGE_NAME, 'new-maskinporten-tests')"
+        if: ${{ !contains(env.IMAGE_NAME, 'new-maskinporten-tests') }}
         run: docker build --tag "${{ env.IMAGE_NAME }}:${{ env.IMAGETAG }}" docker/
 
       - name: Run Trivy vulnerability scanner