diff --git a/5.5/alpine/Dockerfile b/5.5/alpine/Dockerfile index 31a28e584a..7c45becca2 100644 --- a/5.5/alpine/Dockerfile +++ b/5.5/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -37,8 +26,11 @@ ENV PHP_VERSION 5.5.35 ENV PHP_FILENAME php-5.5.35.tar.xz ENV PHP_SHA256 9bef96634af853960be085690b2f4cea5850b749ea950942769b22b1a9f24873 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/5.5/alpine/docker-php-ext-install b/5.5/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.5/alpine/docker-php-ext-install +++ b/5.5/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.5/apache/docker-php-ext-install b/5.5/apache/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.5/apache/docker-php-ext-install +++ b/5.5/apache/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.5/docker-php-ext-install b/5.5/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.5/docker-php-ext-install +++ b/5.5/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.5/fpm/alpine/Dockerfile b/5.5/fpm/alpine/Dockerfile index a3b327cc54..41cd4cf2be 100644 --- a/5.5/fpm/alpine/Dockerfile +++ b/5.5/fpm/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -38,8 +27,11 @@ ENV PHP_VERSION 5.5.35 ENV PHP_FILENAME php-5.5.35.tar.xz ENV PHP_SHA256 9bef96634af853960be085690b2f4cea5850b749ea950942769b22b1a9f24873 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/5.5/fpm/alpine/docker-php-ext-install b/5.5/fpm/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.5/fpm/alpine/docker-php-ext-install +++ b/5.5/fpm/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.5/fpm/docker-php-ext-install b/5.5/fpm/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.5/fpm/docker-php-ext-install +++ b/5.5/fpm/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.5/zts/alpine/Dockerfile b/5.5/zts/alpine/Dockerfile index 6c58a7772c..d35d317f66 100644 --- a/5.5/zts/alpine/Dockerfile +++ b/5.5/zts/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -38,8 +27,11 @@ ENV PHP_VERSION 5.5.35 ENV PHP_FILENAME php-5.5.35.tar.xz ENV PHP_SHA256 9bef96634af853960be085690b2f4cea5850b749ea950942769b22b1a9f24873 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/5.5/zts/alpine/docker-php-ext-install b/5.5/zts/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.5/zts/alpine/docker-php-ext-install +++ b/5.5/zts/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.5/zts/docker-php-ext-install b/5.5/zts/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.5/zts/docker-php-ext-install +++ b/5.5/zts/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile index 411a16b91a..57d7516c00 100644 --- a/5.6/alpine/Dockerfile +++ b/5.6/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -37,8 +26,11 @@ ENV PHP_VERSION 5.6.21 ENV PHP_FILENAME php-5.6.21.tar.xz ENV PHP_SHA256 566ff1a486cb0485ed477a91ea292423f77a58671270ff73b74e67e3ce7084f9 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/5.6/alpine/docker-php-ext-install b/5.6/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.6/alpine/docker-php-ext-install +++ b/5.6/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.6/apache/docker-php-ext-install b/5.6/apache/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.6/apache/docker-php-ext-install +++ b/5.6/apache/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.6/docker-php-ext-install b/5.6/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.6/docker-php-ext-install +++ b/5.6/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile index e556b14cb9..f0ef78487c 100644 --- a/5.6/fpm/alpine/Dockerfile +++ b/5.6/fpm/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -38,8 +27,11 @@ ENV PHP_VERSION 5.6.21 ENV PHP_FILENAME php-5.6.21.tar.xz ENV PHP_SHA256 566ff1a486cb0485ed477a91ea292423f77a58671270ff73b74e67e3ce7084f9 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/5.6/fpm/alpine/docker-php-ext-install b/5.6/fpm/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.6/fpm/alpine/docker-php-ext-install +++ b/5.6/fpm/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.6/fpm/docker-php-ext-install b/5.6/fpm/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.6/fpm/docker-php-ext-install +++ b/5.6/fpm/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile index b79ed52eec..44c8085019 100644 --- a/5.6/zts/alpine/Dockerfile +++ b/5.6/zts/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -38,8 +27,11 @@ ENV PHP_VERSION 5.6.21 ENV PHP_FILENAME php-5.6.21.tar.xz ENV PHP_SHA256 566ff1a486cb0485ed477a91ea292423f77a58671270ff73b74e67e3ce7084f9 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/5.6/zts/alpine/docker-php-ext-install b/5.6/zts/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.6/zts/alpine/docker-php-ext-install +++ b/5.6/zts/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/5.6/zts/docker-php-ext-install b/5.6/zts/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/5.6/zts/docker-php-ext-install +++ b/5.6/zts/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile index 3a9e658c50..59136248bf 100644 --- a/7.0/alpine/Dockerfile +++ b/7.0/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -37,8 +26,11 @@ ENV PHP_VERSION 7.0.6 ENV PHP_FILENAME php-7.0.6.tar.xz ENV PHP_SHA256 1b237a9455e5476a425dbb9d99966bad68107747c601958cb9558a7fb49ab419 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/7.0/alpine/docker-php-ext-install b/7.0/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/7.0/alpine/docker-php-ext-install +++ b/7.0/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/7.0/apache/docker-php-ext-install b/7.0/apache/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/7.0/apache/docker-php-ext-install +++ b/7.0/apache/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/7.0/docker-php-ext-install b/7.0/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/7.0/docker-php-ext-install +++ b/7.0/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile index 90607ce89d..1969524b08 100644 --- a/7.0/fpm/alpine/Dockerfile +++ b/7.0/fpm/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -38,8 +27,11 @@ ENV PHP_VERSION 7.0.6 ENV PHP_FILENAME php-7.0.6.tar.xz ENV PHP_SHA256 1b237a9455e5476a425dbb9d99966bad68107747c601958cb9558a7fb49ab419 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/7.0/fpm/alpine/docker-php-ext-install b/7.0/fpm/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/7.0/fpm/alpine/docker-php-ext-install +++ b/7.0/fpm/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/7.0/fpm/docker-php-ext-install b/7.0/fpm/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/7.0/fpm/docker-php-ext-install +++ b/7.0/fpm/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile index 352bdc38e7..8d27c65616 100644 --- a/7.0/zts/alpine/Dockerfile +++ b/7.0/zts/alpine/Dockerfile @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -38,8 +27,11 @@ ENV PHP_VERSION 7.0.6 ENV PHP_FILENAME php-7.0.6.tar.xz ENV PHP_SHA256 1b237a9455e5476a425dbb9d99966bad68107747c601958cb9558a7fb49ab419 +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/7.0/zts/alpine/docker-php-ext-install b/7.0/zts/alpine/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/7.0/zts/alpine/docker-php-ext-install +++ b/7.0/zts/alpine/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/7.0/zts/docker-php-ext-install b/7.0/zts/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/7.0/zts/docker-php-ext-install +++ b/7.0/zts/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c3c3d36e79..368913a8aa 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,16 +1,5 @@ FROM alpine:3.3 -# phpize deps -RUN apk add --no-cache --virtual .phpize-deps \ - autoconf \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c - # persistent / runtime deps RUN apk add --no-cache --virtual .persistent-deps \ ca-certificates \ @@ -37,8 +26,11 @@ ENV PHP_VERSION %%PHP_VERSION%% ENV PHP_FILENAME %%PHP_FILENAME%% ENV PHP_SHA256 %%PHP_SHA256%% +ENV PHPIZE_DEPS autoconf file g++ gcc libc-dev make pkgconf re2c + RUN set -xe \ && apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ curl-dev \ gnupg \ libedit-dev \ diff --git a/docker-php-ext-install b/docker-php-ext-install index 67180a865b..89f3aa1506 100755 --- a/docker-php-ext-install +++ b/docker-php-ext-install @@ -55,6 +55,11 @@ if [ -z "$exts" ]; then exit 1 fi +: ${PHPIZE_DEPS:="autoconf file g++ gcc libc-dev make pkgconf re2c"} +if [ -e /lib/apk/db/installed ]; then + apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS +fi + for ext in $exts; do ( cd "$ext" @@ -69,3 +74,7 @@ for ext in $exts; do make -j"$j" clean ) done + +if [ -e /lib/apk/db/installed ]; then + apk del .phpize-deps +fi