From 6e765fc37b0f8a83d494241fa64fb8bc97812c87 Mon Sep 17 00:00:00 2001
From: Daniel Thorn <dthorn@mozilla.com>
Date: Mon, 4 Nov 2024 10:37:15 -0800
Subject: [PATCH] Move extra dockerfiles into docker/images/*

---
 .github/dependabot.yml                                 |  4 +++-
 docker-compose.yml                                     | 10 ++++------
 .../fakesentry/Dockerfile}                             |  0
 .../gcs-emulator/Dockerfile}                           |  0
 .../oidcprovider/Dockerfile}                           |  2 +-
 .../oidcprovider/fixtures.json}                        |  0
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename docker/{Dockerfile.fakesentry => images/fakesentry/Dockerfile} (100%)
 rename docker/{Dockerfile.gcs-emulator => images/gcs-emulator/Dockerfile} (100%)
 rename docker/{Dockerfile.oidcprovider => images/oidcprovider/Dockerfile} (68%)
 rename docker/{config/oidcprovider-fixtures.json => images/oidcprovider/fixtures.json} (100%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index dd0bf17e38..071d39ab42 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,7 +8,9 @@ updates:
     open-pull-requests-limit: 10
 
   - package-ecosystem: "docker"
-    directory: "/docker"
+    directories:
+      - "/docker"
+      - "/docker/images/*"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
diff --git a/docker-compose.yml b/docker-compose.yml
index e60c8865dd..a852257645 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   app:
     build:
       context: .
-      dockerfile: ./docker/Dockerfile
+      dockerfile: docker/Dockerfile
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
@@ -145,8 +145,7 @@ services:
   # https://github.com/willkg/kent
   fakesentry:
     build:
-      context: .
-      dockerfile: ./docker/Dockerfile.fakesentry
+      context: docker/images/fakesentry
     image: local/socorro_fakesentry
     ports:
       - "8090:8090"
@@ -156,8 +155,7 @@ services:
   # https://hub.docker.com/r/mozilla/oidc-testprovider
   oidcprovider:
     build:
-      context: .
-      dockerfile: ./docker/Dockerfile.oidcprovider
+      context: docker/images/oidcprovider
     image: local/socorro_oidcprovider
     ports:
       - "8080:8080"
@@ -278,7 +276,7 @@ services:
   # Fake GCP GCS server for local development and testing
   gcs-emulator:
     build:
-      dockerfile: ./docker/Dockerfile.gcs-emulator
+      context: docker/images/gcs-emulator
     image: local/socorro_gcs_emulator
     command: -port 8001 -scheme http
     ports:
diff --git a/docker/Dockerfile.fakesentry b/docker/images/fakesentry/Dockerfile
similarity index 100%
rename from docker/Dockerfile.fakesentry
rename to docker/images/fakesentry/Dockerfile
diff --git a/docker/Dockerfile.gcs-emulator b/docker/images/gcs-emulator/Dockerfile
similarity index 100%
rename from docker/Dockerfile.gcs-emulator
rename to docker/images/gcs-emulator/Dockerfile
diff --git a/docker/Dockerfile.oidcprovider b/docker/images/oidcprovider/Dockerfile
similarity index 68%
rename from docker/Dockerfile.oidcprovider
rename to docker/images/oidcprovider/Dockerfile
index 14c3936179..927196f9b9 100644
--- a/docker/Dockerfile.oidcprovider
+++ b/docker/images/oidcprovider/Dockerfile
@@ -1,6 +1,6 @@
 FROM mozilla/oidc-testprovider:oidc_testprovider-v0.10.10
 
 # Modify redirect_urls specified in "fixtures.json" to fit our needs.
-COPY ./docker/config/oidcprovider-fixtures.json /code/fixtures.json
+COPY fixtures.json /code/fixtures.json
 
 CMD ["./bin/run.sh"]
diff --git a/docker/config/oidcprovider-fixtures.json b/docker/images/oidcprovider/fixtures.json
similarity index 100%
rename from docker/config/oidcprovider-fixtures.json
rename to docker/images/oidcprovider/fixtures.json