From 0c8860d6a27d9eb3de80fb1c09b980c34c4dbd0b Mon Sep 17 00:00:00 2001 From: Smultar Date: Sat, 6 Jan 2024 21:11:28 -0600 Subject: [PATCH] Environment variables now work --- .devcontainer/.env | 8 ++++---- .devcontainer/docker-compose.yml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.devcontainer/.env b/.devcontainer/.env index 7b969762..e7bc6993 100644 --- a/.devcontainer/.env +++ b/.devcontainer/.env @@ -1,9 +1,9 @@ # wf.database MONGODB_URL='localhost' -MONGODB_PORT='27017' -MONDODB_DATABASE='openwf' -MONDODB_USERNAME='root' -MONDODB_PASSWORD='database' +MONGO_INITDB_PORT='27017' +MONGO_INITDB_DATABASE='openwf' +MONGO_INITDB_ROOT_PASSWORD='database' +MONGO_INITDB_ROOT_USERNAME='root' # wf.server logs LOG_LEVEL=trace diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index eb7f840f..476e84f6 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -19,10 +19,10 @@ services: network_mode: service:wf.database environment: - MONGODB_USERNAME: ${MONDODB_USERNAME} - MONGODB_PASSWORD: ${MONDODB_PASSWORD} - MONGODB_DATABASE: ${MONDODB_DATABASE} - MONGODB_PORT: ${MONGODB_PORT} + MONGODB_USERNAME: ${MONGO_INITDB_ROOT_USERNAME} + MONGODB_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD} + MONGODB_DATABASE: ${MONGO_INITDB_DATABASE} + MONGODB_PORT: ${MONGO_INITDB_PORT} MONGODB_URL: ${MONGODB_URL} LOG_LEVEL: ${LOG_LEVEL} LOG_FILES: ${LOG_FILES} @@ -39,10 +39,10 @@ services: # Uncomment to change startup options environment: - MONGO_INITDB_ROOT_USERNAME: ${MONDODB_USERNAME} - MONGO_INITDB_ROOT_PASSWORD: ${MONDODB_PASSWORD} - MONGO_INITDB_DATABASE: ${MONGODB_DATABASE} - MONGO_INITDB_PORT: ${MONGODB_PORT} + MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME} + MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD} + MONGO_INITDB_DATABASE: ${MONGO_INITDB_DATABASE} + MONGO_INITDB_PORT: ${MONGO_INITDB_PORT} env_file: - .env