From b73532ccbba870abc5a0e60ec33b090bf38d3b50 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 14 Aug 2024 16:12:27 -0400 Subject: [PATCH 1/2] Fix host used in minio URLs --- dandi/tests/data/dandiarchive-docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dandi/tests/data/dandiarchive-docker/docker-compose.yml b/dandi/tests/data/dandiarchive-docker/docker-compose.yml index e4ba36c56..3e081b1ed 100644 --- a/dandi/tests/data/dandiarchive-docker/docker-compose.yml +++ b/dandi/tests/data/dandiarchive-docker/docker-compose.yml @@ -29,7 +29,7 @@ services: 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_MINIO_STORAGE_MEDIA_URL: http://127.0.0.1:9000/django-storage DJANGO_DANDI_SCHEMA_VERSION: ~ DJANGO_DANDI_WEB_APP_URL: http://localhost:8085 DJANGO_DANDI_API_URL: http://localhost:8000 From 85f6dd8ede4164e13d8122a10fc20c7be7d4eac7 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Thu, 15 Aug 2024 08:29:55 -0400 Subject: [PATCH 2/2] Add explanatory comment --- dandi/tests/data/dandiarchive-docker/docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dandi/tests/data/dandiarchive-docker/docker-compose.yml b/dandi/tests/data/dandiarchive-docker/docker-compose.yml index 3e081b1ed..3f132d3e0 100644 --- a/dandi/tests/data/dandiarchive-docker/docker-compose.yml +++ b/dandi/tests/data/dandiarchive-docker/docker-compose.yml @@ -29,6 +29,10 @@ services: DJANGO_MINIO_STORAGE_ENDPOINT: minio:9000 DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey DJANGO_STORAGE_BUCKET_NAME: django-storage + # The Minio URL needs to use 127.0.0.1 instead of localhost so that blob + # assets' "S3 URLs" will use 127.0.0.1, and thus tests that try to open + # these URLs via fsspec will not fail on systems where localhost is both + # 127.0.0.1 and ::1. DJANGO_MINIO_STORAGE_MEDIA_URL: http://127.0.0.1:9000/django-storage DJANGO_DANDI_SCHEMA_VERSION: ~ DJANGO_DANDI_WEB_APP_URL: http://localhost:8085