From b50a766e8c1d1fe9f6ff77f8759b340e3e89591f Mon Sep 17 00:00:00 2001
From: Daniel Thorn <dthorn@mozilla.com>
Date: Thu, 25 Jul 2024 18:24:59 -0700
Subject: [PATCH] Don't use custom docker compose services for CI (#1045)

---
 .github/workflows/build-and-push.yml | 15 +++++++------
 .gitignore                           |  1 -
 docker-compose.override.yml          |  9 ++++++++
 docker-compose.yml                   | 32 ----------------------------
 4 files changed, 18 insertions(+), 39 deletions(-)
 create mode 100644 docker-compose.override.yml

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 6042920d..6f181278 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -18,6 +18,9 @@ jobs:
       deployments: write
       id-token: write
     runs-on: ubuntu-latest
+    env:
+      # Disable docker compose volume mounts in docker-compose.override.yml
+      COMPOSE_FILE: docker-compose.yml
     steps:
       - uses: actions/checkout@v4
       - name: Get info
@@ -39,20 +42,20 @@ jobs:
         run: make build
       - name: Verify requirements.txt contains correct dependencies
         run: |
-          docker compose run --rm --no-deps ci shell ./bin/run_verify_reqs.sh
+          docker compose run --rm --no-deps test shell ./bin/run_verify_reqs.sh
       - name: Run lint check
         run: |
           make my.env
-          docker compose run --rm --no-deps ci shell ./bin/run_lint.sh
+          docker compose run --rm --no-deps test shell ./bin/run_lint.sh
       - name: Run tests
         run: |
           make my.env
-          docker compose run --rm ci shell ./bin/run_tests.sh
+          docker compose run --rm test shell ./bin/run_tests.sh
       - name: Run systemtest
         run: |
-          docker compose run --rm ci-web shell ./bin/run_setup.sh
-          docker compose up --detach --wait --wait-timeout=10 ci-web
-          docker compose run --rm ci-web shell bash -c 'cd systemtest && NGINX_TESTS=0 POST_CHECK=1 HOST=http://ci-web:8000 pytest -vv'
+          make setup
+          docker compose up --detach --wait --wait-timeout=10 web
+          docker compose run --rm web shell systemtest/test_env.sh local
 
       - name: Set Docker image tag to "latest" for updates of the main branch
         if: github.ref == 'refs/heads/main'
diff --git a/.gitignore b/.gitignore
index ddb239a4..014d37f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,5 @@ target/
 # Docker things
 /.docker-build
 /fakes3_root/
-docker-compose.override.yml
 my.env
 .env
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 00000000..5fa5019b
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,9 @@
+---
+services:
+  base:
+    # define volumes in docker-compose.override.yml so that can be ignored in CI
+    volumes:
+      - .:/app
+  test:
+    volumes:
+      - .:/app
diff --git a/docker-compose.yml b/docker-compose.yml
index ca6e5bfb..0fee233d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,6 @@ services:
   # building docs.
   base:
     image: local/antenna_deploy_base
-    volumes:
-      - .:/app
 
   # Test container
   test:
@@ -31,8 +29,6 @@ services:
       - gcs-emulator
       - pubsub
       - statsd
-    volumes:
-      - .:/app
 
   devcontainer:
     build:
@@ -53,34 +49,6 @@ services:
     volumes:
       - .:/app
 
-  # Container that we use in CI--it can't volume mount things
-  ci:
-    image: local/antenna_deploy_base
-    env_file:
-      - docker/config/local_dev.env
-      - docker/config/test.env
-      - my.env
-    links:
-      - fakesentry
-      - gcs-emulator
-      - pubsub
-      - statsd
-
-  # like web but CI can't volume mount things
-  ci-web:
-    image: local/antenna_deploy_base
-    env_file:
-      # exclude docker/config/test.env because this will be used for systemtest
-      # which requires store and publish to actually happen
-      - docker/config/local_dev.env
-      - my.env
-    command: web
-    links:
-      - fakesentry
-      - gcs-emulator
-      - pubsub
-      - statsd
-
   # Web container is a prod-like fully-functioning Antenna container
   web:
     extends: