From 30c33f9f931a2988c3935ae18637a05070130765 Mon Sep 17 00:00:00 2001 From: wapmorgan Date: Tue, 12 May 2020 18:09:14 +0300 Subject: [PATCH 1/2] Upgrade php-fpm to 7.1 --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae4d93e..169e9ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,12 @@ LABEL maintainer="Mohammad Abdolirad " \ ADD ./assets ${DOCKAGE_ETC_DIR} -RUN apk --no-cache --update add php5-pgsql postgresql \ +RUN apk del 'php5-*' \ + && rm /usr/bin/php-fpm \ + && apk --no-cache --update add php7-fpm php7-pgsql php7-session php7-mbstring postgresql \ + && ln -s /usr/sbin/php-fpm7 /usr/bin/php-fpm \ + && ln -s /etc/php7 /etc/php5 \ + && runit-enable-service php-fpm \ && ${DOCKAGE_ETC_DIR}/buildtime/install \ && cp -ar ${DOCKAGE_ETC_DIR}/etc/* /etc \ && rm -rf /var/cache/apk/* ${DOCKAGE_ETC_DIR}/etc ${DOCKAGE_ETC_DIR}/buildtime From 4b238846927ab0c1cad1f44865fe51f51e6a4a19 Mon Sep 17 00:00:00 2001 From: wapmorgan Date: Tue, 12 May 2020 18:09:42 +0300 Subject: [PATCH 2/2] Use specific phpPgAdmin version: 7.1.2 release --- assets/buildtime/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/buildtime/install b/assets/buildtime/install index a710170..e2934cf 100755 --- a/assets/buildtime/install +++ b/assets/buildtime/install @@ -4,11 +4,11 @@ set -eux BUILD_PACKAGES_DEPENDENCIES=curl apk add --no-cache ${BUILD_PACKAGES_DEPENDENCIES} -curl -SLO https://github.com/phppgadmin/phppgadmin/archive/master.zip -unzip master.zip -mv ./phppgadmin-master/* ${DOCKAGE_WEBROOT_DIR} +curl -SL --output phpPgAdmin.zip https://github.com/phppgadmin/phppgadmin/releases/download/REL_7-12-1/phpPgAdmin-7.12.1.zip +unzip phpPgAdmin.zip +mv ./phpPgAdmin-7.12.1/* ${DOCKAGE_WEBROOT_DIR} mv ${DOCKAGE_WEBROOT_DIR}/conf/config.inc.php-dist ${DOCKAGE_WEBROOT_DIR}/conf/config.inc.php chown -R nginx:nginx ${DOCKAGE_WEBROOT_DIR} -rm -rf master.zip phppgadmin-master +rm -rf phpPgAdmin.zip phpPgAdmin-7.12.1 apk del ${BUILD_PACKAGES_DEPENDENCIES} \ No newline at end of file