Skip to content

Commit 22c1a25

Browse files
f3l1xf3l1x
committed
PHP7.0: convert to PHP7.1 and deb.sury version
1 parent 857f3d2 commit 22c1a25

5 files changed

Lines changed: 68 additions & 70 deletions

File tree

php/7.0-fpm/Dockerfile renamed to php/7.1-fpm/Dockerfile

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ MAINTAINER Milan Sulc <sulcmil@gmail.com>
66
ENV SSH_AUTH_SOCK=/ssh-agent
77

88
# PHP
9-
ENV PHP_MODS_DIR=/etc/php/7.0/mods-available
10-
ENV PHP_CLI_DIR=/etc/php/7.0/cli/
9+
ENV PHP_MODS_DIR=/etc/php/7.1/mods-available
10+
ENV PHP_CLI_DIR=/etc/php/7.1/cli/
1111
ENV PHP_CLI_CONF_DIR=${PHP_CLI_DIR}/conf.d
12-
ENV PHP_CGI_DIR=/etc/php/7.0/cgi/
12+
ENV PHP_CGI_DIR=/etc/php/7.1/cgi/
1313
ENV PHP_CGI_CONF_DIR=${PHP_CGI_DIR}/conf.d
14-
ENV PHP_FPM_DIR=/etc/php/7.0/fpm/
14+
ENV PHP_FPM_DIR=/etc/php/7.1/fpm/
1515
ENV PHP_FPM_CONF_DIR=${PHP_FPM_DIR}/conf.d
1616

1717
# XDEBUG
@@ -35,39 +35,38 @@ RUN apt-get update && apt-get dist-upgrade -y && \
3535
cp /etc/skel/.bashrc /home/dfx/ && chown dfx:dfx -R /home/dfx/ && \
3636
# SSH ######################################################################
3737
echo " IdentityFile ~/.ssh/id_rsa" >> /etc/ssh/ssh_config && \
38-
# PHP DOTDEB ###############################################################
39-
echo 'deb http://packages.dotdeb.org jessie all' >> /etc/apt/sources.list.d/dotdeb.list && \
40-
echo 'deb-src http://packages.dotdeb.org jessie all' >> /etc/apt/sources.list.d/dotdeb.list && \
41-
wget http://www.dotdeb.org/dotdeb.gpg && apt-key add dotdeb.gpg && rm dotdeb.gpg && \
38+
# PHP DEB.SURY.CZ ##########################################################
39+
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
40+
echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list && \
4241
apt-get update && \
43-
apt-get install -y \
44-
php7.0-apc \
45-
php7.0-apcu \
46-
php7.0-bz2 \
47-
php7.0-cli \
48-
php7.0-cgi \
49-
php7.0-curl \
50-
php7.0-fpm \
51-
php7.0-geoip \
52-
php7.0-gd \
53-
php7.0-intl \
54-
php7.0-imagick \
55-
php7.0-imap \
56-
php7.0-ldap \
57-
php7.0-mbstring \
58-
php7.0-mcrypt \
59-
php7.0-memcached \
60-
php7.0-mongo \
61-
php7.0-mysql \
62-
php7.0-pgsql \
63-
php7.0-redis \
64-
php7.0-soap \
65-
php7.0-sqlite \
66-
php7.0-ssh2 \
67-
php7.0-zip \
68-
php7.0-xmlrpc \
69-
php7.0-xsl \
70-
php7.0-xdebug && \
42+
apt-get install -y --no-install-recommends \
43+
php7.1-apc \
44+
php7.1-apcu \
45+
php7.1-bz2 \
46+
php7.1-cli \
47+
php7.1-cgi \
48+
php7.1-curl \
49+
php7.1-fpm \
50+
php7.1-geoip \
51+
php7.1-gd \
52+
php7.1-intl \
53+
php7.1-imagick \
54+
php7.1-imap \
55+
php7.1-ldap \
56+
php7.1-mbstring \
57+
php7.1-mcrypt \
58+
php7.1-memcached \
59+
php7.1-mongo \
60+
php7.1-mysql \
61+
php7.1-pgsql \
62+
php7.1-redis \
63+
php7.1-soap \
64+
php7.1-sqlite \
65+
php7.1-ssh2 \
66+
php7.1-zip \
67+
php7.1-xmlrpc \
68+
php7.1-xsl \
69+
php7.1-xdebug && \
7170
# PHPMAILER ################################################################
7271
curl -o ${PHPMAILER_BIN} https://raw.githubusercontent.com/dockette/phpmailer/master/phpmailer && \
7372
mkdir -p ${PHPMAILER_PATH} && \

php/7.0-fpm/conf.d/devstack.ini renamed to php/7.1-fpm/conf.d/devstack.ini

File renamed without changes.

php/7.0-fpm/fpm/php-fpm.conf renamed to php/7.1-fpm/fpm/php-fpm.conf

File renamed without changes.

php/7.0/Dockerfile renamed to php/7.1/Dockerfile

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ MAINTAINER Milan Sulc <sulcmil@gmail.com>
66
ENV SSH_AUTH_SOCK=/ssh-agent
77

88
# PHP
9-
ENV PHP_MODS_DIR=/etc/php/7.0/mods-available
10-
ENV PHP_CLI_DIR=/etc/php/7.0/cli/
9+
ENV PHP_MODS_DIR=/etc/php/7.1/mods-available
10+
ENV PHP_CLI_DIR=/etc/php/7.1/cli/
1111
ENV PHP_CLI_CONF_DIR=${PHP_CLI_DIR}/conf.d
12-
ENV PHP_CGI_DIR=/etc/php/7.0/cgi/
12+
ENV PHP_CGI_DIR=/etc/php/7.1/cgi/
1313
ENV PHP_CGI_CONF_DIR=${PHP_CGI_DIR}/conf.d
1414

1515
# XDEBUG
@@ -33,38 +33,37 @@ RUN apt-get update && apt-get dist-upgrade -y && \
3333
cp /etc/skel/.bashrc /home/dfx/ && chown dfx:dfx -R /home/dfx/ && \
3434
# SSH ######################################################################
3535
echo " IdentityFile ~/.ssh/id_rsa" >> /etc/ssh/ssh_config && \
36-
# PHP DOTDEB ###############################################################
37-
echo 'deb http://packages.dotdeb.org jessie all' >> /etc/apt/sources.list.d/dotdeb.list && \
38-
echo 'deb-src http://packages.dotdeb.org jessie all' >> /etc/apt/sources.list.d/dotdeb.list && \
39-
wget http://www.dotdeb.org/dotdeb.gpg && apt-key add dotdeb.gpg && rm dotdeb.gpg && \
36+
# PHP DEB.SURY.CZ ##########################################################
37+
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
38+
echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list && \
4039
apt-get update && \
41-
apt-get install -y \
42-
php7.0-apc \
43-
php7.0-apcu \
44-
php7.0-bz2 \
45-
php7.0-cli \
46-
php7.0-cgi \
47-
php7.0-curl \
48-
php7.0-geoip \
49-
php7.0-gd \
50-
php7.0-intl \
51-
php7.0-imagick \
52-
php7.0-imap \
53-
php7.0-ldap \
54-
php7.0-mbstring \
55-
php7.0-mcrypt \
56-
php7.0-memcached \
57-
php7.0-mongo \
58-
php7.0-mysql \
59-
php7.0-pgsql \
60-
php7.0-redis \
61-
php7.0-soap \
62-
php7.0-sqlite \
63-
php7.0-ssh2 \
64-
php7.0-zip \
65-
php7.0-xmlrpc \
66-
php7.0-xsl \
67-
php7.0-xdebug && \
40+
apt-get install -y --no-install-recommends \
41+
php7.1-apc \
42+
php7.1-apcu \
43+
php7.1-bz2 \
44+
php7.1-cli \
45+
php7.1-cgi \
46+
php7.1-curl \
47+
php7.1-geoip \
48+
php7.1-gd \
49+
php7.1-intl \
50+
php7.1-imagick \
51+
php7.1-imap \
52+
php7.1-ldap \
53+
php7.1-mbstring \
54+
php7.1-mcrypt \
55+
php7.1-memcached \
56+
php7.1-mongo \
57+
php7.1-mysql \
58+
php7.1-pgsql \
59+
php7.1-redis \
60+
php7.1-soap \
61+
php7.1-sqlite \
62+
php7.1-ssh2 \
63+
php7.1-zip \
64+
php7.1-xmlrpc \
65+
php7.1-xsl \
66+
php7.1-xdebug && \
6867
# PHPMAILER ################################################################
6968
curl -o ${PHPMAILER_BIN} https://raw.githubusercontent.com/dockette/phpmailer/master/phpmailer && \
7069
mkdir -p ${PHPMAILER_PATH} && \

php/7.0/conf.d/devstack.ini renamed to php/7.1/conf.d/devstack.ini

File renamed without changes.

0 commit comments

Comments
 (0)