Merge pull request #333 from WyriHaximusNet/install-as-early-as-possible

Install make as early as possible

Author: WyriHaximus

Dockerfile-nts-alpine

@@ -27,7 +27,18 @@ LABEL org.label-schema.title="Opinionated ReactPHP optimised PHP Docker images"
 
 RUN set -x \
     && apk upgrade --no-cache \
-    && apk add --no-cache moreutils \
+    && apk add --no-cache \
+        moreutils \
+        make \
+        libuv-dev \
+        zlib-dev  \
+        icu-dev \
+        libevent-dev \
+        openssl-dev \
+        bash \
+        coreutils \
+        procps \
+        git \
     && addgroup -g 1000 app \
     && adduser -u 1000 -D -G app app --home /opt/app \
     && touch /.you-are-in-a-wyrihaximus.net-php-docker-image
@@ -64,17 +75,7 @@ COPY --from=ghcr.io/php/pie:1.2.1-bin /pie /usr/bin/pie
 
 RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
 	mv /*.so "$EXTENSION_DIR/" && \
-	apk add --no-cache \
-        libuv-dev \
-        zlib-dev  \
-        icu-dev \
-        libevent-dev \
-        openssl-dev \
-        bash \
-        coreutils \
-        procps \
-        git \
-        $PHPIZE_DEPS \
+	apk add --no-cache $PHPIZE_DEPS \
     ## Install PECL
     && wget -q pear.php.net/go-pear.phar && php go-pear.phar \
     && install-php-extensions pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv opcache intl sockets ffi opentelemetry \

Dockerfile-nts-debian

@@ -13,9 +13,9 @@ LABEL org.label-schema.name="wyrihaximusnet/php" \
 
 ARG ARCH=amd64
 
-RUN apt-get update \
+RUN set -x \
+    && apt-get update \
     && yes | apt-get upgrade \
-    && set -x \
     && addgroup --gid 1000 app \
     && adduser --uid 1000 --gid 1000 --disabled-password app --home /opt/app \
     && touch /.you-are-in-a-wyrihaximus.net-php-docker-image

Dockerfile-zts-alpine

@@ -27,7 +27,20 @@ LABEL org.label-schema.title="Opinionated ReactPHP optimised PHP Docker images"
 
 RUN set -x \
     && apk upgrade --no-cache \
-    && apk add --no-cache moreutils \
+    && apk add --no-cache \
+        moreutils \
+        make \
+        libuv-dev \
+        zlib-dev  \
+        icu-dev \
+        libevent-dev \
+        openssl-dev \
+        git \
+        openssh-client \
+        bash \
+        coreutils \
+        procps \
+        git \
     && addgroup -g 1000 app \
     && adduser -u 1000 -D -G app app --home /opt/app \
     && touch /.you-are-in-a-wyrihaximus.net-php-docker-image
@@ -65,20 +78,7 @@ COPY --from=ghcr.io/php/pie:1.2.1-bin /pie /usr/bin/pie
 RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
   rm /usr/local/etc/php/conf.d/jit.ini && \
 	mv /*.so "$EXTENSION_DIR/" && \
-	apk add --no-cache \
-        libuv-dev \
-        zlib-dev  \
-        icu-dev \
-        libevent-dev \
-        openssl-dev \
-        make \
-        git \
-        openssh-client \
-        bash \
-        coreutils \
-        procps \
-        git \
-        $PHPIZE_DEPS \
+	apk add --no-cache $PHPIZE_DEPS \
     ## Install PECL
     && wget -q pear.php.net/go-pear.phar && php go-pear.phar \
     && install-php-extensions pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv opcache intl sockets ffi opentelemetry \

Dockerfile-zts-debian

@@ -13,9 +13,9 @@ LABEL org.label-schema.name="wyrihaximusnet/php" \
 
 ARG ARCH=amd64
 
-RUN apt-get update \
+RUN set -x \
+    && apt-get update \
     && yes | apt-get upgrade \
-    && set -x \
     && addgroup --gid 1000 app \
     && adduser --uid 1000 --gid 1000 --disabled-password app --home /opt/app \
     && touch /.you-are-in-a-wyrihaximus.net-php-docker-image

test/container/test_pie.py

@@ -2,7 +2,7 @@
 
 @pytest.mark.php_zts
 @pytest.mark.php_nts
-def test_make_works(host):
+def test_pie_works(host):
     output = host.run('pie')
     assert u'🥧 PHP Installer for Extensions (PIE) 1.' in output.stdout
     assert output.stderr == ''