WIP: Moving prod dockerfiles out of defunct k8s dir.

Author: DXCanas

.github/workflows/containerbuild.yml

@@ -79,7 +79,7 @@ jobs:
         with:
           skip_after_successful_duplicate: false
           github_token: ${{ github.token }}
-          paths: '["k8s/images/nginx/*", ".github/workflows/containerbuild.yml"]'
+          paths: '["docker/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: ./k8s/images/nginx/Dockerfile
+        file: ./docker/prod/nginx/Dockerfile
         platforms: linux/amd64
         push: false

cloudbuild-pr.yaml

@@ -20,7 +20,7 @@ steps:
   waitFor: ['-']              # don't wait for previous steps
   args: [
     'build',
-    '-f', 'k8s/images/nginx/Dockerfile',
+    '-f', 'docker/prod/nginx/Dockerfile',
     '--cache-from', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:$COMMIT_SHA',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest',

cloudbuild-production.yaml

@@ -12,7 +12,7 @@ steps:
   - >
     docker build
     --build_arg COMMIT_SHA=$COMMIT_SHA
-    -f k8s/images/app/Dockerfile
+    -f docker/prod/app/Dockerfile
     --cache-from gcr.io/$PROJECT_ID/learningequality-studio-app:latest
     -t gcr.io/$PROJECT_ID/learningequality-studio-app:$COMMIT_SHA
     -t gcr.io/$PROJECT_ID/learningequality-studio-app:latest
@@ -23,7 +23,7 @@ steps:
   waitFor: ['-']              # don't wait for previous steps
   args: [
     'build',
-    '-f', 'k8s/images/nginx/Dockerfile',
+    '-f', 'docker/prod/nginx/Dockerfile',
     '--cache-from', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:$COMMIT_SHA',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-nginx:latest',
@@ -40,7 +40,7 @@ steps:
   waitFor: ['pull-prober-image-cache']              # don't wait for previous steps
   args: [
     'build',
-    '-f', 'k8s/images/prober/Dockerfile',
+    '-f', 'docker/prod/prober/Dockerfile',
     '--cache-from', 'gcr.io/$PROJECT_ID/learningequality-studio-prober:latest',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-prober:$COMMIT_SHA',
     '-t', 'gcr.io/$PROJECT_ID/learningequality-studio-prober:latest',

docker-compose.yml

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