Revert .env to use localhost for database and instead change docker-c…

…ompose #11
ral-facilities · Sep 23, 2024 · 10fd0d4 · 10fd0d4
1 parent 579e2f1
commit 10fd0d4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -150,4 +150,4 @@ Listed below are the environment variables supported by the application.
 | `OBJECT_STORAGE__ENDPOINT_URL`      | The URL of the object storage S3 endpoint.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Yes       |                                                  |
 | `OBJECT_STORAGE__ACCESS_KEY`        | The access key to use to authenticate with the S3 object storage.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Yes       |                                                  |
 | `OBJECT_STORAGE__SECRET_ACCESS_KEY` | The secret access key to use to authenticate with the S3 object storage.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Yes       |                                                  |
-| `OBJECT_STORAGE__BUCKET_NAME`       | The name of the S3 bucket to use for object storage.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |           |                                                  |
+| `OBJECT_STORAGE__BUCKET_NAME`       | The name of the S3 bucket to use for object storage.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Yes       |                                                  |
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,9 +4,14 @@ services:
     build: .
     volumes:
       - ./object_storage_api:/object-storage-api-run/object_storage_api
+    restart: on-failure
     ports:
       - 8000:8000
-    restart: on-failure
+    depends_on:
+      - mongo-db
+      - minio
+    environment:
+      DATABASE__HOST_AND_OPTIONS: object_storage_api_mongodb_container:27017/?authMechanism=SCRAM-SHA-256&authSource=admin
 
   mongo-db:
     image: mongo:7.0-jammy

diff --git a/object_storage_api/.env.example b/object_storage_api/.env.example
@@ -9,7 +9,7 @@ API__ALLOWED_CORS_METHODS=["*"]
 DATABASE__PROTOCOL=mongodb
 DATABASE__USERNAME=root
 DATABASE__PASSWORD=example
-DATABASE__HOST_AND_OPTIONS="object_storage_api_mongodb_container:27017/?authMechanism=SCRAM-SHA-256&authSource=admin"
+DATABASE__HOST_AND_OPTIONS="localhost:27017/?authMechanism=SCRAM-SHA-256&authSource=admin"
 DATABASE__NAME=object-storage
 OBJECT_STORAGE__ENDPOINT_URL="http://minio:9000"
 OBJECT_STORAGE__ACCESS_KEY=root