From d1f3bc8e5c3b2a5644752a86d20d7ac09480ef30 Mon Sep 17 00:00:00 2001
From: andreypaa <andreypaa@gmail.com>
Date: Thu, 21 Mar 2019 18:19:32 +0300
Subject: [PATCH] Pgadmin newest version 4.x (#2054)

* new last version pgadmin
---
 docker-compose.yml | 10 +++++++---
 env-example        |  6 ++++++
 pgadmin/Dockerfile | 10 ----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 pgadmin/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index aeb6d16..0d18592 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -595,11 +595,15 @@ services:
 
 ### pgAdmin ##############################################
     pgadmin:
-      build: ./pgadmin
+      container_name: pgadmin
+      image: dpage/pgadmin4:latest
+      environment:
+        - "PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}"
+        - "PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}"
       ports:
-        - "5050:5050"
+        - "${PGADMIN_PORT}:80"
       volumes:
-        - ${DATA_PATH_HOST}/pgadmin-backup:/var/lib/pgadmin/storage/pgadmin4
+        - ${DATA_PATH_HOST}/pgadmin:/var/lib/pgadmin
       depends_on:
         - postgres
       networks:
diff --git a/env-example b/env-example
index 674547d..704f0b7 100644
--- a/env-example
+++ b/env-example
@@ -666,3 +666,9 @@ MANTICORE_CONFIG_PATH=./manticore/config
 MANTICORE_API_PORT=9312
 MANTICORE_SPHINXQL_PORT=9306
 MANTICORE_HTTP_PORT=9308
+
+### pgadmin ##################################################
+# use this address http://ip6-localhost:5050
+PGADMIN_PORT=5050
+PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org
+PGADMIN_DEFAULT_PASSWORD=admin
diff --git a/pgadmin/Dockerfile b/pgadmin/Dockerfile
deleted file mode 100644
index f0ec44b..0000000
--- a/pgadmin/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM fenglc/pgadmin4:alpine
-
-LABEL maintainer="Huadong Zuo <admin@zuohuadong.cn>"
-
-# user: pgadmin4@pgadmin.org
-# password: admin
-# pg_dump & postgresql all in  "/usr/bin"
-# backup in "/var/lib/pgadmin/storage/pgadmin4"
-
-EXPOSE 5050