diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6478971..d0e7384 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -23,9 +23,9 @@ RUN set -ex; \ ; \ \ mkdir -p /usr/src/php/ext/uploadprogress; \ - curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ - echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" | sha256sum -c -; \ - tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ + curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ + echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" | sha256sum -c -; \ + tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ docker-php-ext-install -j "$(nproc)" \ @@ -38,7 +38,7 @@ RUN set -ex; \ uploadprogress \ ; \ \ - rm -r /usr/src/php/ext/uploadprogress; \ + rm -r /usr/src/php/ext/uploadprogress /usr/src/php/ext/uploadprogress.tar.gz; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 010a3ba..0cc1150 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -25,9 +25,9 @@ RUN set -ex; \ ; \ \ mkdir -p /usr/src/php/ext/uploadprogress; \ - curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ - echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" | sha256sum -c -; \ - tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ + curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ + echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" | sha256sum -c -; \ + tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ docker-php-ext-install -j "$(nproc)" \ @@ -40,7 +40,7 @@ RUN set -ex; \ uploadprogress \ ; \ \ - rm -r /usr/src/php/ext/uploadprogress; \ + rm -r /usr/src/php/ext/uploadprogress /usr/src/php/ext/uploadprogress.tar.gz; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ diff --git a/apache/Dockerfile b/apache/Dockerfile index 5a14b34..0ed8edc 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -26,9 +26,9 @@ RUN set -ex; \ ; \ \ mkdir -p /usr/src/php/ext/uploadprogress; \ - curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ - echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" | sha256sum -c -; \ - tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ + curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ + echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" | sha256sum -c -; \ + tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ docker-php-ext-install -j "$(nproc)" \ @@ -41,7 +41,7 @@ RUN set -ex; \ uploadprogress \ ; \ \ - rm -r /usr/src/php/ext/uploadprogress; \ + rm -r /usr/src/php/ext/uploadprogress /usr/src/php/ext/uploadprogress.tar.gz; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index ebd97d7..027293c 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -24,9 +24,9 @@ RUN set -ex; \ ; \ \ mkdir -p /usr/src/php/ext/uploadprogress; \ - curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ - echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" | sha256sum -c -; \ - tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ + curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ + echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" | sha256sum -c -; \ + tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ docker-php-ext-install -j "$(nproc)" \ @@ -39,7 +39,7 @@ RUN set -ex; \ uploadprogress \ ; \ \ - rm -r /usr/src/php/ext/uploadprogress; \ + rm -r /usr/src/php/ext/uploadprogress /usr/src/php/ext/uploadprogress.tar.gz; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ diff --git a/fpm/Dockerfile b/fpm/Dockerfile index f74e9e5..e123445 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -26,9 +26,9 @@ RUN set -ex; \ ; \ \ mkdir -p /usr/src/php/ext/uploadprogress; \ - curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ - echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" | sha256sum -c -; \ - tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ + curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \ + echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" | sha256sum -c -; \ + tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \ \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ docker-php-ext-install -j "$(nproc)" \ @@ -41,7 +41,7 @@ RUN set -ex; \ uploadprogress \ ; \ \ - rm -r /usr/src/php/ext/uploadprogress; \ + rm -r /usr/src/php/ext/uploadprogress /usr/src/php/ext/uploadprogress.tar.gz; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \