Update env files

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

Makefile

@@ -20,7 +20,7 @@
 
 DOCKER := docker
 
-PROFILE := wp_db wordpress webserver certbot phpmyadmin flask_website flask_db qbittorrent
+PROFILE := wp_db wordpress webserver certbot phpmyadmin flask_website flask_db pgadmin qbittorrent
 PROFILE_CMD := $(addprefix --profile ,$(PROFILE))
 
 COMPOSE_FILE := docker-compose.yml

docker-compose.yml

@@ -59,12 +59,8 @@ services:
       - flask_db
     volumes:
       - ./bensuperpc_website:/app:rw
-    environment:
+    env_file:
-      FLASK_DEBUG: "${FLASK_DEBUG:-1}"
+      - env/flask_website.env
-      POSTGRES_URL: "${POSTGRES_URL:-flask_db:5432}"
-      POSTGRES_USER: "${POSTGRES_USER:-postgres}"
-      POSTGRES_PW: "${POSTGRES_PW:-postgres}"
-      POSTGRES_DB: "${POSTGRES_DB:-website}"
     restart: unless-stopped
     ports:
       - 5000:5000
@@ -76,11 +72,8 @@ services:
     profiles:
       - flask_db
     restart: unless-stopped
-    environment:
+    env_file:
-      POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-trust}"
+      - env/flask_database.env
-      POSTGRES_USER: "${POSTGRES_USER:-postgres}"
-      POSTGRES_PASSWORD: "${POSTGRES_PW:-postgres}"
-      POSTGRES_DB: "${POSTGRES_DB:-website}"
 #    ports:
 #      - 5432:5432
     volumes: 
@@ -132,6 +125,18 @@ services:
       - wp_db
     networks:
       - app-network
+  pgadmin:
+    container_name: pgadmin_container
+    image: dpage/pgadmin4:6.16
+    profiles:
+      - pgadmin
+    restart: unless-stopped
+    env_file:
+      - env/pgadmin.env
+    depends_on:
+      - flask_db
+    networks:
+      - app-network
 volumes:
   certbot-etc:
     name: certbot-etc

env/flask_database.env

@@ -0,0 +1,4 @@
+POSTGRES_HOST_AUTH_METHOD=trust
+POSTGRES_USER=bensuperpc
+POSTGRES_PASSWORD=nPRh270dKH3hz%6HS2$X%8F3fqoQ*Fex
+POSTGRES_DB=website

env/flask_website.env

@@ -0,0 +1,7 @@
+FLASK_DEBUG=1
+
+# Acces to the database
+POSTGRES_URL=flask_db:5432
+POSTGRES_USER=bensuperpc
+POSTGRES_PW=nPRh270dKH3hz%6HS2$X%8F3fqoQ*Fex
+POSTGRES_DB=website

env/pgadmin.env

@@ -0,0 +1,3 @@
+PGADMIN_DEFAULT_EMAIL=bensuperpc@bensuperpc.org
+PGADMIN_DEFAULT_PASSWORD=LmRVf9DY291ez7B^^%2RntHcsCrJ5fQ!
+#PGADMIN_ENABLE_TLS