django database connection now uses .env

docker-compose/docker-compose.yml

@@ -18,7 +18,13 @@ services:
       - website_data:/var/www/djangoserver
     networks:
       - transcendence
-    build: requirements/djangoserver
+    build:
+      context: requirements/djangoserver
+      args:
+        DB_NAME: ${DB_NAME}
+        DB_USERNAME: ${DB_USERNAME}
+        DB_PASSWORD: ${DB_PASSWORD}
+        DB_HOST: ${DB_HOST}
     restart: always 
     ports:
       - "9000:9000"

docker-compose/requirements/djangoserver/Dockerfile

@@ -5,6 +5,10 @@ RUN apt update && apt upgrade -y
 RUN apt install -y python3 python3-pip postgresql-client
 RUN pip3 install django psycopg
 
+ARG DB_HOST=;
+ARG DB_NAME=;
+ARG DB_USERNAME=;
+ARG DB_PASSWORD=;
 
 RUN mkdir -p /var/www/djangoserver/
 RUN mkdir -p /var/www/djangoserver/static/
@@ -12,8 +16,15 @@ COPY file/server /var/www/djangoserver/server
 RUN chmod 755 /var/www/djangoserver/
 RUN chown -R www-data:www-data /var/www/djangoserver/
 
+RUN sed -i "s/VAR_DB_HOST/$DB_HOST/" /var/www/djangoserver/server/server/settings.py
+RUN sed -i "s/VAR_DB_NAME/$DB_NAME/" /var/www/djangoserver/server/server/settings.py
+RUN sed -i "s/VAR_DB_USERNAME/$DB_USERNAME/" /var/www/djangoserver/server/server/settings.py
+RUN sed -i "s/VAR_DB_PASSWORD/$DB_PASSWORD/" /var/www/djangoserver/server/server/settings.py
+
 WORKDIR /var/www/djangoserver
 STOPSIGNAL SIGKILL
 
 #ENTRYPOINT [ "python3", "/var/www/djangoserver/server/manage.py","runserver" ]
+
+#don't mind this, it's just for testings purposes
 ENTRYPOINT ["sleep","inf"]

docker-compose/requirements/djangoserver/file/server/server/settings.py

@@ -76,11 +76,11 @@ WSGI_APPLICATION = 'server.wsgi.application'
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "HOST":"postgresql",
+        "HOST":"VAR_DB_HOST",
         "PORT":5432,
-        "NAME":"patate_douce",
+        "NAME":"VAR_DB_NAME",
-        "USER":"tmlp",
+        "USER":"VAR_DB_USERNAME",
-        "PASSWORD":"password"
+        "PASSWORD":"VAR_DB_PASSWORD"
     }
 }
 

docker-compose/requirements/postgresql/setup.sh

@@ -5,3 +5,4 @@ createdb $DB_NAME
 psql -c "CREATE USER $DB_USERNAME WITH PASSWORD '$DB_PASSWORD'"
 psql -c "GRANT ALL PRIVILEGES ON database $DB_NAME TO $DB_USERNAME"
 EOF
+service postgresql stop