Skip to content

Commit 13838e7

Browse files
committed
Updated PHP to 7.3
1 parent dc09894 commit 13838e7

2 files changed

Lines changed: 11 additions & 13 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
},
7676
"config": {
7777
"platform": {
78-
"php": "7.2",
78+
"php": "7.3",
7979
"ext-gd": "1"
8080
}
8181
}

docker-src/cms/Dockerfile

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#------------------------------------------------------------------------------
22
# PHP BASE
33
#------------------------------------------------------------------------------
4-
FROM php:7.2-fpm-alpine as php-base
4+
FROM php:7.3-fpm-alpine as php-base
55

66
# Set timezone.
77
ENV PHP_TIMEZONE America/New_York
@@ -12,7 +12,7 @@ RUN cat /dev/urandom | LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 64 | head -n 1 >
1212
WORKDIR /var/www
1313

1414
RUN apk add --no-cache --virtual .build-deps \
15-
# unknown needed
15+
# Misc dependencies
1616
autoconf \
1717
g++ \
1818
pcre-dev \
@@ -23,35 +23,33 @@ RUN apk add --no-cache --virtual .build-deps \
2323
# Needed base depend
2424
coreutils
2525

26+
RUN apk add --no-cache --update mysql-client
27+
2628
# Install PHP memcached extension
2729
# look at following for PHP 7.2 https://stackoverflow.com/a/41575677
2830
RUN set -xe \
29-
&& apk add --no-cache --update libmemcached-libs zlib mysql-client \
31+
&& apk add --no-cache --update libmemcached-libs zlib \
3032
&& apk add --no-cache --update --virtual .memcached-build-deps \
3133
zlib-dev \
3234
libmemcached-dev \
33-
cyrus-sasl-dev \
34-
&& git clone -b php7 https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
35-
&& docker-php-ext-configure /usr/src/php/ext/memcached \
36-
--disable-memcached-sasl \
37-
&& docker-php-ext-install /usr/src/php/ext/memcached \
38-
&& rm -rf /usr/src/php/ext/memcached \
35+
&& pecl install memcached \
36+
&& docker-php-ext-enable memcached \
3937
# Cleanup
4038
&& rm -rf /tmp/* ~/.pearrc /usr/share/php7 \
4139
&& docker-php-source delete \
4240
&& apk del .memcached-build-deps
4341

4442
# install the PHP extensions we need
45-
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
4643
RUN set -ex \
47-
&& apk add --no-cache --virtual .build-deps2 \
44+
&& apk add --no-cache --virtual .build-php-exts \
4845
# GD depends
4946
freetype-dev \
5047
libjpeg-turbo-dev \
5148
libpng-dev \
5249
# xmlrpc depends
5350
libxml2-dev \
5451
libxslt-dev \
52+
libzip-dev \
5553
# Configure and Install PHP extensions
5654
&& docker-php-ext-configure gd \
5755
--with-freetype-dir=/usr/include/ \
@@ -77,7 +75,7 @@ RUN set -ex \
7775
&& rm -rf /tmp/pear ~/.pearrc \
7876
&& chown -R www-data:www-data /usr/local/var/log \
7977
&& docker-php-source delete \
80-
&& apk del .build-deps .build-deps2 \
78+
&& apk del .build-deps .build-php-exts \
8179
&& rm -rf /tmp/* /var/cache/apk/*
8280

8381
COPY docker-src/cms/php-conf.d/* /usr/local/etc/php/conf.d/

0 commit comments

Comments
 (0)