Skip to content

Commit

Permalink
Merge pull request #1213 from amazeeio/1212_nghttp2-fix2
Browse files Browse the repository at this point in the history
Fixes #1212 - by force updating and upgrading the nghttp2-libs package
  • Loading branch information
Schnitzel authored Sep 2, 2019
2 parents 17c15de + eea007d commit b176ab4
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions images/php/fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ RUN apk add --no-cache fcgi \
# for webp
libwebp-dev \
postgresql-dev \
# workaround for https://github.com/amazeeio/lagoon/issues/1208 to have the latest version
nghttp2-libs \
&& apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS \
&& if [ ${PHP_VERSION%.*} == "7.3" ]; then \
yes '' | pecl install -f apcu \
Expand All @@ -78,6 +76,7 @@ RUN apk add --no-cache fcgi \
docker-php-ext-install mcrypt; \
fi \
&& sed -i '1s/^/;Intentionally disabled. Enable via setting env variable XDEBUG_ENABLE to true\n;/' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& apk update && apk upgrade nghttp2-libs \
&& rm -rf /var/cache/apk/* /tmp/pear/ \
&& apk del .phpize-deps \
&& mkdir -p /tmp/newrelic && cd /tmp/newrelic \
Expand Down

0 comments on commit b176ab4

Please sign in to comment.