WIP: Flattening out new image structure, following current naming standard.

And deleting defunct cloudbuild prod yaml

Author: DXCanas

.github/workflows/containerbuild.yml

@@ -79,7 +79,7 @@ jobs:
         with:
           skip_after_successful_duplicate: false
           github_token: ${{ github.token }}
-          paths: '["docker/prod/nginx/*", ".github/workflows/containerbuild.yml"]'
+          paths: '["docker/Dockerfile.nginx.prod", "nginx/*", ".github/workflows/containerbuild.yml"]'
 
   build_nginx:
     name: nginx - test build of nginx Docker image
@@ -100,6 +100,6 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ./
-        file: ./docker/prod/nginx/Dockerfile
+        file: ./docker/Dockerfile.nginx.prod
         platforms: linux/amd64
         push: false

cloudbuild-production.yaml

@@ -35,7 +35,7 @@ services:
     platform: linux/amd64
     build:
       context: .
-      dockerfile: docker/prod/nginx/Dockerfile
+      dockerfile: docker/Dockerfile.nginx.prod
     ports:
       - "8081:8080"
     depends_on:

docker-compose.yml

@@ -1,7 +1,7 @@
 FROM nginx:1.25
 
 # Build from inside the directory by overriding this.
-ARG SRC_DIR=k8s/images/nginx
+ARG SRC_DIR=docker/prod/nginx
 
 RUN rm /etc/nginx/conf.d/*      # if there's stuff here, nginx won't read sites-enabled
 COPY ${SRC_DIR}/nginx.conf /etc/nginx/nginx.conf