From d552f9f24ea65966b8ed526241c0162ee387a407 Mon Sep 17 00:00:00 2001
From: Dave Nicoll <dave.nicoll@slalom.com>
Date: Fri, 2 Jun 2023 13:44:29 -0700
Subject: [PATCH 1/2] Repo layout improvement

---
 .github/labeler.yml                                       | 3 ++-
 .github/workflows/docker-build-and-publish.yml            | 8 ++++----
 .../full-alpine-amd64/Dockerfile                          | 0
 .../full-ubuntu-amd64/Dockerfile                          | 0
 .../standard-alpine-amd64/Dockerfile                      | 0
 .../standard-ubuntu-amd64/Dockerfile                      | 0
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename Dockerfile/full-alpine-amd64 => images/full-alpine-amd64/Dockerfile (100%)
 rename Dockerfile/full-ubuntu-amd64 => images/full-ubuntu-amd64/Dockerfile (100%)
 rename Dockerfile/standard-alpine-amd64 => images/standard-alpine-amd64/Dockerfile (100%)
 rename Dockerfile/standard-ubuntu-amd64 => images/standard-ubuntu-amd64/Dockerfile (100%)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 5938646..694c1eb 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,5 +1,6 @@
 docker:
-  - "Dockerfile/*"
+  - "images/*"
+  - ".github/workflows/docker*"
 
 documentation:
   - "**/*.md"
diff --git a/.github/workflows/docker-build-and-publish.yml b/.github/workflows/docker-build-and-publish.yml
index 991e08d..5549fd8 100644
--- a/.github/workflows/docker-build-and-publish.yml
+++ b/.github/workflows/docker-build-and-publish.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/standard-alpine-amd64 --no-cache -t standard-alpine-amd64:${{ github.sha }}
+        run: docker build . --file images/standard-alpine-amd64/Dockerfile --no-cache -t standard-alpine-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -61,7 +61,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/standard-ubuntu-amd64 --no-cache -t standard-ubuntu-amd64:${{ github.sha }}
+        run: docker build . --file images/standard-ubuntu-amd64/Dockerfile --no-cache -t standard-ubuntu-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -97,7 +97,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/full-alpine-amd64 --no-cache -t full-alpine-amd64:${{ github.sha }}
+        run: docker build . --file images/full-alpine-amd64/Dockerfile --no-cache -t full-alpine-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -132,7 +132,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/full-ubuntu-amd64 --no-cache -t full-ubuntu-amd64:${{ github.sha }}
+        run: docker build . --file images/full-ubuntu-amd64/Dockerfile --no-cache -t full-ubuntu-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
diff --git a/Dockerfile/full-alpine-amd64 b/images/full-alpine-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/full-alpine-amd64
rename to images/full-alpine-amd64/Dockerfile
diff --git a/Dockerfile/full-ubuntu-amd64 b/images/full-ubuntu-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/full-ubuntu-amd64
rename to images/full-ubuntu-amd64/Dockerfile
diff --git a/Dockerfile/standard-alpine-amd64 b/images/standard-alpine-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/standard-alpine-amd64
rename to images/standard-alpine-amd64/Dockerfile
diff --git a/Dockerfile/standard-ubuntu-amd64 b/images/standard-ubuntu-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/standard-ubuntu-amd64
rename to images/standard-ubuntu-amd64/Dockerfile

From 49095e3ec112e6840d6f8de7d449674acc763ca1 Mon Sep 17 00:00:00 2001
From: Dave Nicoll <dave.nicoll@slalom.com>
Date: Fri, 2 Jun 2023 13:47:03 -0700
Subject: [PATCH 2/2] updated paths

---
 .github/workflows/docker-build-and-publish.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-build-and-publish.yml b/.github/workflows/docker-build-and-publish.yml
index 5549fd8..717cbc1 100644
--- a/.github/workflows/docker-build-and-publish.yml
+++ b/.github/workflows/docker-build-and-publish.yml
@@ -5,7 +5,7 @@ on:
   push:
     branches: ["main"]
     paths:
-      - "Dockerfile/**"
+      - "images/**"
   schedule:
     - cron: "0 2 * * 0" # Weekly on Sundays at 02:00
 
@@ -51,7 +51,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
           buildoptions: "--compress --force-rm"
-          dockerfile: Dockerfile/standard-alpine-amd64
+          dockerfile: images/standard-alpine-amd64/Dockerfile
           tags: "latest,${{ env.IMAGE_TAG }}"
 
   standard-ubuntu:
@@ -87,7 +87,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
           buildoptions: "--compress --force-rm"
-          dockerfile: Dockerfile/standard-ubuntu-amd64
+          dockerfile: images/standard-ubuntu-amd64/Dockerfile
           tags: "latest,${{ env.IMAGE_TAG }}"
 
   full-alpine:
@@ -122,7 +122,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
           buildoptions: "--compress --force-rm"
-          dockerfile: Dockerfile/full-alpine-amd64
+          dockerfile: images/full-alpine-amd64/Dockerfile
           tags: "latest,${{ env.IMAGE_TAG }}"
 
   full-ubuntu:
@@ -157,5 +157,5 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
           buildoptions: "--compress --force-rm"
-          dockerfile: Dockerfile/full-ubuntu-amd64
+          dockerfile: images/full-ubuntu-amd64/Dockerfile
           tags: "latest,${{ env.IMAGE_TAG }}"