Skip to content

Commit 12ab5df

Browse files
committed
Update to PHP 7.3
1 parent 2c6ea76 commit 12ab5df

File tree

2 files changed

+26
-46
lines changed

2 files changed

+26
-46
lines changed

7.2/Dockerfile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ RUN apt-get -yqq install \
9797
php7.2-redis \
9898
php7.2-xdebug \
9999
libapache2-mod-php7.2
100-
101-
# php7.2-mcrypt \
102100

103101
# PHP Timezone
104102
RUN \
@@ -107,16 +105,6 @@ RUN \
107105
echo "date.timezone = \"$TZ\";" > /etc/php/7.2/apache2/conf.d/timezone.ini && \
108106
echo "date.timezone = \"$TZ\";" > /etc/php/7.2/cli/conf.d/timezone.ini
109107

110-
# PHP xdebug
111-
# RUN \
112-
# wget https://github.com/xdebug/xdebug/archive/master.zip && \
113-
# unzip master.zip && \
114-
# cd xdebug-master && \
115-
# phpize7.2 && \
116-
# ./configure --enable-xdebug && \
117-
# make && make install && \
118-
# echo "zend_extension=xdebug.so" >> /etc/php/7.2/mods-available/xdebug.ini && \
119-
# cd .. && rm -fr xdebug-master master.zip
120108

121109
# Install manually xhprof
122110
RUN \

7.3/Dockerfile

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -70,34 +70,36 @@ RUN \
7070
# Install PHP7 with Xdebug (dev environment)
7171
RUN apt-get -yqq install \
7272
php7.3 \
73-
php7.3-curl \
73+
php7.3-apcu \
7474
php7.3-bcmath \
7575
php7.3-bz2 \
76+
php7.3-curl \
7677
php7.3-dev \
7778
php7.3-gd \
7879
php7.3-dom \
7980
php7.3-imap \
81+
php7.3-imagick \
8082
php7.3-intl \
8183
php7.3-json \
8284
php7.3-ldap \
8385
php7.3-mbstring \
8486
php7.3-mysql \
8587
php7.3-odbc \
88+
php7.3-opcache \
89+
php7.3-redis \
90+
php7.3-opcache \
91+
php7.3-xdebug \
8692
php7.3-xml \
93+
php7.3-yaml \
8794
php7.3-zip \
88-
php7.3-opcache \
8995
libapache2-mod-php7.3
9096

91-
# php7.3-imagick \
92-
# php7.3-oauth \
93-
# php7.3-uploadprogress \
94-
# php7.3-ssh2 \
95-
# php7.3-solr \
96-
# php7.3-memcache \
97-
# php7.3-memcached \
98-
# php7.3-apcu \
99-
# php7.3-redis \
100-
# php7.3-mcrypt \
97+
# php7.3-oauth \
98+
# php7.3-uploadprogress \
99+
# php7.3-ssh2 \
100+
# php7.3-solr \
101+
# php7.3-memcache \
102+
# php7.3-memcached \
101103

102104
# PHP Timezone
103105
RUN \
@@ -106,34 +108,24 @@ RUN \
106108
echo "date.timezone = \"$TZ\";" > /etc/php/7.3/apache2/conf.d/timezone.ini && \
107109
echo "date.timezone = \"$TZ\";" > /etc/php/7.3/cli/conf.d/timezone.ini
108110

109-
# PHP xdebug
111+
112+
# Install manually xhprof
110113
RUN \
111-
wget https://github.com/xdebug/xdebug/archive/master.zip && \
114+
cd /tmp && \
115+
wget https://github.com/Yaoguais/phpng-xhprof/archive/master.zip && \
112116
unzip master.zip && \
113-
cd xdebug-master && \
117+
cd phpng-xhprof-master && \
114118
phpize7.3 && \
115-
./configure --enable-xdebug && \
119+
./configure --with-php-config=/usr/bin/php-config7.3 && \
116120
make && make install && \
117-
echo "zend_extension=xdebug.so" >> /etc/php/7.3/mods-available/xdebug.ini && \
118-
cd .. && rm -fr xdebug-master master.zip
119-
120-
# Install manually xhprof
121-
# RUN \
122-
# cd /tmp && \
123-
# wget https://github.com/Yaoguais/phpng-xhprof/archive/master.zip && \
124-
# unzip master.zip && \
125-
# cd phpng-xhprof-master && \
126-
# phpize7.3 && \
127-
# ./configure --with-php-config=/usr/bin/php-config7.3 && \
128-
# make && make install && \
129-
# mv /usr/lib/php/20170718/phpng_xhprof.so /usr/lib/php/20170718/xhprof.so && \
130-
# echo "extension=xhprof.so" > /etc/php/7.3/mods-available/xhprof.ini && \
131-
# echo "xhprof.output_dir=/var/www/xhprof" >> /etc/php/7.3/mods-available/xhprof.ini
121+
mv /usr/lib/php/20180731/phpng_xhprof.so /usr/lib/php/20180731/xhprof.so && \
122+
echo "extension=xhprof.so" > /etc/php/7.3/mods-available/xhprof.ini && \
123+
echo "xhprof.output_dir=/var/www/xhprof" >> /etc/php/7.3/mods-available/xhprof.ini
132124

133125
# Install manually APC
134-
# RUN \
135-
# echo "extension=apcu.so" > /etc/php/7.3/mods-available/apcu_bc.ini && \
136-
# echo "extension=apc.so" >> /etc/php/7.3/mods-available/apcu_bc.ini
126+
RUN \
127+
echo "extension=apcu.so" > /etc/php/7.3/mods-available/apcu_bc.ini && \
128+
echo "extension=apc.so" >> /etc/php/7.3/mods-available/apcu_bc.ini
137129

138130
# Install SMTP.
139131
RUN apt-get install -y ssmtp && \

0 commit comments

Comments
 (0)