Move dev-specific services into compose overrides file

.github/workflows/push_pull_request_test.yml

@@ -16,7 +16,7 @@ jobs:
         run: |
           cd ./openverse_catalog
           cp env.template .env
-          docker-compose up -d
+          docker-compose --file=docker-compose.yml --file=openverse_catalog/docker-compose.override.yml up -d
       - name: Test
         run: |
           sleep 10

openverse_catalog/docker-compose.override.yml

@@ -1,9 +1,35 @@
 version: '3'
 
 services:
+  # Services only needed for local development
+  postgres:
+    build: ./local_postgres
+    environment:
+      - POSTGRES_USER=deploy
+      - POSTGRES_PASSWORD=deploy
+      - POSTGRES_DB=openledger
+    env_file: .env
+    ports:
+      - "5434:5432"
+    volumes:
+      - postgres-volume:/var/lib/postgresql/data
+
+  s3:
+    build:
+      context: ./local_s3
+    ports:
+      - "5000:5000"
+
+  # Dev changes for the webserver container
   webserver:
+    depends_on:
+      - postgres
+      - s3
     volumes:
       - ./dags:/usr/local/airflow/dags
     build:
       args:
         - REQUIREMENTS_FILE=requirements_dev.txt
+
+volumes:
+  postgres-volume:

openverse_catalog/docker-compose.yml

@@ -1,23 +1,6 @@
 version: '3'
 
 services:
-  postgres:
-    build: ./local_postgres
-    environment:
-      - POSTGRES_USER=deploy
-      - POSTGRES_PASSWORD=deploy
-      - POSTGRES_DB=openledger
-    env_file: .env
-    ports:
-      - "5434:5432"
-    volumes:
-      - postgres-volume:/var/lib/postgresql/data
-
-  s3:
-    build:
-      context: ./local_s3
-    ports:
-      - "5000:5000"
 
   webserver:
     build:
@@ -27,14 +10,10 @@ services:
         - REQUIREMENTS_FILE=requirements_prod.txt
     env_file: .env
     restart: always
-    depends_on:
-      - postgres
-      - s3
     ports:
       - "${AIRFLOW_PORT}:8080"
     volumes:
       - airflow-volume:/tmp/workflow_output
 
 volumes:
   airflow-volume:
-  postgres-volume: