From 195608d3d3613b361b8a26bf7e44bd767de4a48e Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Wed, 9 Dec 2015 19:39:18 +0100 Subject: [PATCH 1/9] Download phppgadmin from github instead of sourceforge --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3f9cc4..7bc1d5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ FROM maxexcloo/nginx-php:latest MAINTAINER Max Schaefer -ENV VERSION 5.1 + +ARG PHPPGADMIN_VERSION=5-1-0 + RUN mkdir -p /data/http && \ cd /data/http && \ - wget -O - "http://www.sourceforge.net/projects/phppgadmin/files/phpPgAdmin%20%5Bstable%5D/phpPgAdmin-${VERSION}/phpPgAdmin-${VERSION}.tar.gz/download" | tar --strip-components=1 -x -z && \ + wget -O - "https://github.com/phppgadmin/phppgadmin/archive/REL_${PHPPGADMIN_VERSION}.tar.gz" | tar --strip-components=1 -x -z && \ rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS ADD data /data From aed683d3d47d8bf13505bb69d9a8174ad21ad948 Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Wed, 9 Dec 2015 19:48:49 +0100 Subject: [PATCH 2/9] Make phppgadmin configurable via environment variables --- Dockerfile | 7 +++++-- README.md | 8 ++++++++ data/config/php-pgadmin.conf | 3 +++ data/http/conf/config.inc.php | 6 +++--- 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 README.md create mode 100644 data/config/php-pgadmin.conf diff --git a/Dockerfile b/Dockerfile index 7bc1d5d..f55a6a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,13 @@ FROM maxexcloo/nginx-php:latest MAINTAINER Max Schaefer -ARG PHPPGADMIN_VERSION=5-1-0 +ENV POSTGRESQL_HOST=postgresql +ENV POSTGRESQL_PORT=5432 +ENV POSTGRESQL_DEFAULT_DB=pg RUN mkdir -p /data/http && \ cd /data/http && \ - wget -O - "https://github.com/phppgadmin/phppgadmin/archive/REL_${PHPPGADMIN_VERSION}.tar.gz" | tar --strip-components=1 -x -z && \ + wget -O - "https://github.com/phppgadmin/phppgadmin/archive/REL_5-1-0.tar.gz" | tar --strip-components=1 -x -z && \ rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS + ADD data /data diff --git a/README.md b/README.md new file mode 100644 index 0000000..268182a --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ + +# Default environment variables + +``` +POSTGRESQL_HOST=postgresql +POSTGRESQL_PORT=5432 +POSTGRESQL_DEFAULT_DB=pg +``` diff --git a/data/config/php-pgadmin.conf b/data/config/php-pgadmin.conf new file mode 100644 index 0000000..24fd362 --- /dev/null +++ b/data/config/php-pgadmin.conf @@ -0,0 +1,3 @@ +env[POSTGRESQL_HOST] = $POSTGRESQL_HOST +env[POSTGRESQL_PORT] = $POSTGRESQL_PORT +env[POSTGRESQL_DEFAULT_DB] = $POSTGRESQL_DEFAULT_DB diff --git a/data/http/conf/config.inc.php b/data/http/conf/config.inc.php index cdc11b0..e3b51c7 100644 --- a/data/http/conf/config.inc.php +++ b/data/http/conf/config.inc.php @@ -1,9 +1,9 @@ Date: Tue, 17 Apr 2018 10:08:29 +0200 Subject: [PATCH 3/9] Use curl instead of wget --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f55a6a8..4f80f75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV POSTGRESQL_DEFAULT_DB=pg RUN mkdir -p /data/http && \ cd /data/http && \ - wget -O - "https://github.com/phppgadmin/phppgadmin/archive/REL_5-1-0.tar.gz" | tar --strip-components=1 -x -z && \ + curl -L "https://github.com/phppgadmin/phppgadmin/archive/REL_5-1-0.tar.gz" | tar --strip-components=1 -x -z && \ rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS ADD data /data From b2720db07087610e5737006651ddba713bdfcef6 Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Thu, 19 Apr 2018 14:40:53 +0200 Subject: [PATCH 4/9] Fix working dir --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f80f75..5b2b75d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM maxexcloo/nginx-php:latest -MAINTAINER Max Schaefer ENV POSTGRESQL_HOST=postgresql ENV POSTGRESQL_PORT=5432 ENV POSTGRESQL_DEFAULT_DB=pg -RUN mkdir -p /data/http && \ - cd /data/http && \ - curl -L "https://github.com/phppgadmin/phppgadmin/archive/REL_5-1-0.tar.gz" | tar --strip-components=1 -x -z && \ - rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS +WORKDIR /app -ADD data /data +RUN curl -L "https://github.com/phppgadmin/phppgadmin/archive/REL_5-1-0.tar.gz" | tar --strip-components=1 -x -z && \ + rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS +WORKDIR / + +ADD data /app From 815d14760c13a6c8428e2215662024c47c009927 Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Thu, 19 Apr 2018 15:04:16 +0200 Subject: [PATCH 5/9] Fix config --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5b2b75d..8abdea9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,5 @@ RUN curl -L "https://github.com/phppgadmin/phppgadmin/archive/REL_5-1-0.tar.gz" rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS WORKDIR / -ADD data /app +ADD data/config /config +ADD data/http /app From c0ac2282bdbb0b6386f4a83cc59416bb5fe0c2a9 Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Tue, 14 May 2019 17:38:46 +0200 Subject: [PATCH 6/9] Bump phppgadmin version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8abdea9..cc9e3fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV POSTGRESQL_DEFAULT_DB=pg WORKDIR /app -RUN curl -L "https://github.com/phppgadmin/phppgadmin/archive/REL_5-1-0.tar.gz" | tar --strip-components=1 -x -z && \ +RUN curl -L "https://github.com/phppgadmin/phppgadmin/releases/download/REL_5-6-0/phpPgAdmin-5.6.0.tar.bz2" | tar --strip-components=1 -x -z && \ rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS WORKDIR / From 639859a0f9e1e85264f00580c6952233b52ca753 Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Wed, 15 May 2019 11:28:08 +0200 Subject: [PATCH 7/9] Update nginx php image --- Dockerfile | 8 ++++---- {data/http => app}/conf/config.inc.php | 0 {data/config => config}/php-pgadmin.conf | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename {data/http => app}/conf/config.inc.php (100%) rename {data/config => config}/php-pgadmin.conf (100%) diff --git a/Dockerfile b/Dockerfile index cc9e3fb..2be0647 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM maxexcloo/nginx-php:latest +FROM webdevops/php-nginx:7.3 +MAINTAINER Fizix ENV POSTGRESQL_HOST=postgresql ENV POSTGRESQL_PORT=5432 @@ -8,7 +9,6 @@ WORKDIR /app RUN curl -L "https://github.com/phppgadmin/phppgadmin/releases/download/REL_5-6-0/phpPgAdmin-5.6.0.tar.bz2" | tar --strip-components=1 -x -z && \ rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS -WORKDIR / -ADD data/config /config -ADD data/http /app +ADD config /config +ADD app /app diff --git a/data/http/conf/config.inc.php b/app/conf/config.inc.php similarity index 100% rename from data/http/conf/config.inc.php rename to app/conf/config.inc.php diff --git a/data/config/php-pgadmin.conf b/config/php-pgadmin.conf similarity index 100% rename from data/config/php-pgadmin.conf rename to config/php-pgadmin.conf From cdb75d2a86cd7024241b3401e60b068d0c3dab5d Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Wed, 15 May 2019 11:53:00 +0200 Subject: [PATCH 8/9] Fix tar.bz2 extract --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2be0647..1ea2390 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV POSTGRESQL_DEFAULT_DB=pg WORKDIR /app -RUN curl -L "https://github.com/phppgadmin/phppgadmin/releases/download/REL_5-6-0/phpPgAdmin-5.6.0.tar.bz2" | tar --strip-components=1 -x -z && \ +RUN curl -L "https://github.com/phppgadmin/phppgadmin/releases/download/REL_5-6-0/phpPgAdmin-5.6.0.tar.bz2" | tar --strip-components=1 -xj && \ rm -rf conf/config.inc.php-dist CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS ADD config /config From 41ddf2f142cca4b86f89a6d204a117bfdd58c998 Mon Sep 17 00:00:00 2001 From: Arnaud Didry Date: Wed, 15 May 2019 12:18:12 +0200 Subject: [PATCH 9/9] Update config --- app/conf/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/conf/config.inc.php b/app/conf/config.inc.php index e3b51c7..0499528 100644 --- a/app/conf/config.inc.php +++ b/app/conf/config.inc.php @@ -14,7 +14,7 @@ $conf['show_advanced'] = false; $conf['show_system'] = false; $conf['min_password_length'] = 1; -$conf['left_width'] = 200; +$conf['left_width'] = 340; $conf['theme'] = 'default'; $conf['show_oids'] = false; $conf['max_rows'] = 30;