From 09c0dbe7d70ccf9c295221e636c6760b8984e1bd Mon Sep 17 00:00:00 2001
From: James <james39.smith@live.uwe.ac.uk>
Date: Sun, 3 Mar 2024 20:28:13 +0000
Subject: [PATCH] fixed bug with authentication for default postgres user,
cleaned up duplicate .env files. refactored code within docker-compose to be
more consistent within itself
---
myproject/.env | 2 +-
myproject/.env.dev | 5 -----
myproject/docker-compose.yml | 7 +++----
3 files changed, 4 insertions(+), 10 deletions(-)
delete mode 100644 myproject/.env.dev
diff --git a/myproject/.env b/myproject/.env
index aedd4d0..ef6b411 100644
--- a/myproject/.env
+++ b/myproject/.env
@@ -13,7 +13,7 @@ DEBUG=True
#postgres
-POSTGRES_DB=placeholder
+POSTGRES_DB=mlaas
POSTGRES_NAME=mlaas
POSTGRES_USER=user
POSTGRES_PASSWORD=password
diff --git a/myproject/.env.dev b/myproject/.env.dev
deleted file mode 100644
index ace728f..0000000
--- a/myproject/.env.dev
+++ /dev/null
@@ -1,5 +0,0 @@
-POSTGRES_NAME=mlaas
-POSTGRES_USER=user
-POSTGRES_PASSWORD=password
-POSTGRES_HOST=db
-POSTGRES_PORT=5432
\ No newline at end of file
diff --git a/myproject/docker-compose.yml b/myproject/docker-compose.yml
index 254a076..f82138c 100644
--- a/myproject/docker-compose.yml
+++ b/myproject/docker-compose.yml
@@ -52,9 +52,9 @@ services:
- postgres_data:/var/lib/postgresql/data
restart: unless-stopped
environment:
- POSTGRES_USER: user
- POSTGRES_PASSWORD: root_password
- POSTGRES_DB: mlaas
+ POSTGRES_USER: ${POSTGRES_USER}
+ POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+ POSTGRES_DB: ${POSTGRES_NAME}
ports:
- "5432:5432"
web:
@@ -72,7 +72,6 @@ services:
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_PORT: ${POSTGRES_PORT}
- POSTGRES_DB: ${POSTGRES_DB}
ports:
- "8000:8000"
#legacy env file
--
GitLab