Skip to content

Upgrade PHP (->7.1) and phpPgAdmin (->7.12.1) #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wapmorgan wants to merge 2 commits into from
Closed

Upgrade PHP (->7.1) and phpPgAdmin (->7.12.1) #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c33f9
Upgrade php-fpm to 7.1
wapmorgan May 12, 2020
4b23884
Use specific phpPgAdmin version: 7.1.2 release
wapmorgan May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ LABEL maintainer="Mohammad Abdolirad <m.abdolirad@gmail.com>" \

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
8 changes: 4 additions & 4 deletions assets/buildtime/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}