From bd23dfbf9df2af21d005293c493a244a2f83ea6e Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 24 Jul 2024 08:56:47 -0400 Subject: [PATCH 1/2] docker-compose.yml: Remove obsolete `version` key --- dandi/tests/data/dandiarchive-docker/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/dandi/tests/data/dandiarchive-docker/docker-compose.yml b/dandi/tests/data/dandiarchive-docker/docker-compose.yml index 5a9e75d85..681d6691d 100644 --- a/dandi/tests/data/dandiarchive-docker/docker-compose.yml +++ b/dandi/tests/data/dandiarchive-docker/docker-compose.yml @@ -4,8 +4,6 @@ # , # but using images uploaded to Docker Hub instead of building them locally. -version: '2.1' - services: django: image: dandiarchive/dandiarchive-api From c6f369f12ab41f0abcbb23e4a2fafb8b6b1e8c82 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 24 Jul 2024 08:58:39 -0400 Subject: [PATCH 2/2] docker-compose.yml: Deduplicate django & celery envvars --- .../dandiarchive-docker/docker-compose.yml | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dandi/tests/data/dandiarchive-docker/docker-compose.yml b/dandi/tests/data/dandiarchive-docker/docker-compose.yml index 681d6691d..e4ba36c56 100644 --- a/dandi/tests/data/dandiarchive-docker/docker-compose.yml +++ b/dandi/tests/data/dandiarchive-docker/docker-compose.yml @@ -17,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 @@ -30,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 @@ -61,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