Fixed pgAdmin configuration

oskardudycz · Oct 28, 2021 · f309a65 · f309a65
1 parent 95aa370
commit f309a65
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/Sample/ECommerce/docker/docker-compose.yml b/Sample/ECommerce/docker/docker-compose.yml
@@ -16,6 +16,9 @@ services:
         environment:
             PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:[email protected]}
             PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin}
+            PGADMIN_CONFIG_SERVER_MODE: 'False'
+        volumes:
+            - pgadmin:/var/lib/pgadmin
         ports:
             - "${PGADMIN_PORT:-5050}:80"
         networks:

diff --git a/Sample/EventStoreDB/Simple/docker/docker-compose.yml b/Sample/EventStoreDB/Simple/docker/docker-compose.yml
@@ -6,7 +6,7 @@ services:
         environment:
             POSTGRES_PASSWORD: Password12!
         ports:
-            - "5432:5432"
+            - '5432:5432'
         networks:
             - postgres
 
@@ -16,11 +16,14 @@ services:
         environment:
             PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:[email protected]}
             PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin}
+            PGADMIN_CONFIG_SERVER_MODE: 'False'
+        volumes:
+            - pgadmin:/var/lib/pgadmin
         ports:
             - "${PGADMIN_PORT:-5050}:80"
         networks:
             - postgres
-            
+
     #######################################################
     #  EventStoreDB
     #######################################################

diff --git a/Workshops/BuildYourOwnEventStore/docker/docker-compose.yml b/Workshops/BuildYourOwnEventStore/docker/docker-compose.yml
@@ -12,18 +12,21 @@ services:
 
     pgadmin:
         image: dpage/pgadmin4
-        container_name: pgadmin
+        container_name: pgadmin_container
         environment:
-            PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-admin@pgadmin.org}
+            PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-pgadmin4@pgadmin.org}
             PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin}
+            PGADMIN_CONFIG_SERVER_MODE: 'False'
+        volumes:
+            - pgadmin:/var/lib/pgadmin
         ports:
             - "${PGADMIN_PORT:-5050}:80"
         networks:
             - postgres
 
 networks:
     postgres:
-        driver: bridge
+        driver: postgres
 
 volumes:
     postgres:

diff --git a/docker-compose.build.yml b/docker-compose.build.yml
@@ -11,18 +11,21 @@ services:
         ports:
             - "5432:5432"
         networks:
-            - pg_network
+            - postgres
 
     pgadmin:
         image: dpage/pgadmin4
-        container_name: pgadmin
+        container_name: pgadmin_container
         environment:
-            PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-admin@pgadmin.org}
+            PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-pgadmin4@pgadmin.org}
             PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin}
+            PGADMIN_CONFIG_SERVER_MODE: 'False'
+        volumes:
+            - pgadmin:/var/lib/pgadmin
         ports:
             - "${PGADMIN_PORT:-5050}:80"
         networks:
-            - pg_network
+            - postgres
 
     backend:
         build:
@@ -35,10 +38,10 @@ services:
           postgres:
             condition: service_healthy
         networks:
-            - pg_network
+            - postgres
 
 networks:
-    pg_network:
+    postgres:
         driver: bridge
 
 volumes:

diff --git a/docker-compose.pg.yml b/docker-compose.pg.yml
@@ -11,21 +11,24 @@ services:
         ports:
             - "5432:5432"
         networks:
-            - pg_network
+            - postgres
 
     pgadmin:
         image: dpage/pgadmin4
-        container_name: pgadmin
+        container_name: pgadmin_container
         environment:
-            PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-admin@pgadmin.org}
+            PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-pgadmin4@pgadmin.org}
             PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin}
+            PGADMIN_CONFIG_SERVER_MODE: 'False'
+        volumes:
+            - pgadmin:/var/lib/pgadmin
         ports:
             - "${PGADMIN_PORT:-5050}:80"
         networks:
-            - pg_network
+            - postgres
 
 networks:
-    pg_network:
+    postgres:
         driver: bridge
 
 volumes: