Merge pull request #1470 from dandi/more-compose

Further improvements to `docker-compose.yml`
dandi · Jul 24, 2024 · 3958b56 · 3958b56
2 parents 2308f95 + c6f369f
commit 3958b56
Showing 1 changed file with 3 additions and 22 deletions.
diff --git a/dandi/tests/data/dandiarchive-docker/docker-compose.yml b/dandi/tests/data/dandiarchive-docker/docker-compose.yml
@@ -4,8 +4,6 @@
 # <https://github.com/dandi/dandi-api/blob/master/docker-compose.override.yml>,
 # but using images uploaded to Docker Hub instead of building them locally.
 
-version: '2.1'
-
 services:
   django:
     image: dandiarchive/dandiarchive-api
@@ -19,7 +17,7 @@ services:
         condition: service_healthy
       rabbitmq:
         condition: service_started
-    environment:
+    environment: &django_env
       DJANGO_CELERY_BROKER_URL: amqp://rabbitmq:5672/
       DJANGO_CONFIGURATION: DevelopmentConfiguration
       DJANGO_DANDI_DANDISETS_BUCKET_NAME: dandi-dandisets
@@ -32,7 +30,7 @@ services:
       DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
       DJANGO_STORAGE_BUCKET_NAME: django-storage
       DJANGO_MINIO_STORAGE_MEDIA_URL: http://localhost:9000/django-storage
-      DJANGO_DANDI_SCHEMA_VERSION:
+      DJANGO_DANDI_SCHEMA_VERSION: ~
       DJANGO_DANDI_WEB_APP_URL: http://localhost:8085
       DJANGO_DANDI_API_URL: http://localhost:8000
       DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org
@@ -63,25 +61,8 @@ services:
       rabbitmq:
         condition: service_started
     environment:
-      DJANGO_CELERY_BROKER_URL: amqp://rabbitmq:5672/
-      DJANGO_CONFIGURATION: DevelopmentConfiguration
-      DJANGO_DANDI_DANDISETS_BUCKET_NAME: dandi-dandisets
-      DJANGO_DANDI_DANDISETS_LOG_BUCKET_NAME: dandiapi-dandisets-logs
-      DJANGO_DANDI_DANDISETS_EMBARGO_BUCKET_NAME: dandi-embargoed-dandisets
-      DJANGO_DANDI_DANDISETS_EMBARGO_LOG_BUCKET_NAME: dandiapi-embargo-dandisets-logs
-      DJANGO_DATABASE_URL: postgres://postgres:postgres@postgres:5432/django
-      DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
-      DJANGO_MINIO_STORAGE_ENDPOINT: minio:9000
-      DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
-      DJANGO_STORAGE_BUCKET_NAME: django-storage
-      DJANGO_MINIO_STORAGE_MEDIA_URL: http://localhost:9000/django-storage
-      DJANGO_DANDI_SCHEMA_VERSION:
+      << : *django_env
       DJANGO_DANDI_VALIDATION_JOB_INTERVAL: "5"
-      DJANGO_DANDI_WEB_APP_URL: http://localhost:8085
-      DJANGO_DANDI_API_URL: http://localhost:8000
-      DJANGO_DANDI_JUPYTERHUB_URL: https://hub.dandiarchive.org
-      DJANGO_DANDI_DEV_EMAIL: "test@example.com"
-      DANDI_ALLOW_LOCALHOST_URLS: "1"
 
   minio:
     image: minio/minio:RELEASE.2022-04-12T06-55-35Z