Remove superfluous uploadprogress.tar.gz

PhrozenByte · PhrozenByte · commit efbc630a79a7 · 2025-10-08T16:32:35.000+02:00
diff --git 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,8 @@ RUN set -ex; \
         uploadprogress \
     ; \
     \
-    rm -r /usr/src/php/ext/uploadprogress; \
+    rm -rf /usr/src/php/ext/uploadprogress; \
+    rm -f /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
@@ -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,8 @@ RUN set -ex; \
         uploadprogress \
     ; \
     \
-    rm -r /usr/src/php/ext/uploadprogress; \
+    rm -rf /usr/src/php/ext/uploadprogress; \
+    rm -f /usr/src/php/ext/uploadprogress.tar.gz; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
diff --git 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,8 @@ RUN set -ex; \
         uploadprogress \
     ; \
     \
-    rm -r /usr/src/php/ext/uploadprogress; \
+    rm -rf /usr/src/php/ext/uploadprogress; \
+    rm -f /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
@@ -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,8 @@ RUN set -ex; \
         uploadprogress \
     ; \
     \
-    rm -r /usr/src/php/ext/uploadprogress; \
+    rm -rf /usr/src/php/ext/uploadprogress; \
+    rm -f /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
@@ -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,8 @@ RUN set -ex; \
         uploadprogress \
     ; \
     \
-    rm -r /usr/src/php/ext/uploadprogress; \
+    rm -rf /usr/src/php/ext/uploadprogress; \
+    rm -f /usr/src/php/ext/uploadprogress.tar.gz; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ RUN set -ex; \`
`23`	`23`	`; \`
`24`	`24`	`\`
`25`	`25`	`mkdir -p /usr/src/php/ext/uploadprogress; \`
`26`		`- curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
`27`		`- echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" \| sha256sum -c -; \`
`28`		`- tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
	`26`	`+ curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
	`27`	`+ echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" \| sha256sum -c -; \`
	`28`	`+ tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
`29`	`29`	`\`
`30`	`30`	`docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \`
`31`	`31`	`docker-php-ext-install -j "$(nproc)" \`
`@@ -38,7 +38,8 @@ RUN set -ex; \`
`38`	`38`	`uploadprogress \`
`39`	`39`	`; \`
`40`	`40`	`\`
`41`		`- rm -r /usr/src/php/ext/uploadprogress; \`
	`41`	`+ rm -rf /usr/src/php/ext/uploadprogress; \`
	`42`	`+ rm -f /usr/src/php/ext/uploadprogress.tar.gz; \`
`42`	`43`	`\`
`43`	`44`	`runDeps="$( \`
`44`	`45`	`scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ RUN set -ex; \`
`25`	`25`	`; \`
`26`	`26`	`\`
`27`	`27`	`mkdir -p /usr/src/php/ext/uploadprogress; \`
`28`		`- curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
`29`		`- echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" \| sha256sum -c -; \`
`30`		`- tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
	`28`	`+ curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
	`29`	`+ echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" \| sha256sum -c -; \`
	`30`	`+ tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
`31`	`31`	`\`
`32`	`32`	`docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \`
`33`	`33`	`docker-php-ext-install -j "$(nproc)" \`
`@@ -40,7 +40,8 @@ RUN set -ex; \`
`40`	`40`	`uploadprogress \`
`41`	`41`	`; \`
`42`	`42`	`\`
`43`		`- rm -r /usr/src/php/ext/uploadprogress; \`
	`43`	`+ rm -rf /usr/src/php/ext/uploadprogress; \`
	`44`	`+ rm -f /usr/src/php/ext/uploadprogress.tar.gz; \`
`44`	`45`	`\`
`45`	`46`	`apt-mark auto '.*' > /dev/null; \`
`46`	`47`	`apt-mark manual $savedAptMark; \`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ RUN set -ex; \`
`26`	`26`	`; \`
`27`	`27`	`\`
`28`	`28`	`mkdir -p /usr/src/php/ext/uploadprogress; \`
`29`		`- curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
`30`		`- echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" \| sha256sum -c -; \`
`31`		`- tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
	`29`	`+ curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
	`30`	`+ echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" \| sha256sum -c -; \`
	`31`	`+ tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
`32`	`32`	`\`
`33`	`33`	`docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \`
`34`	`34`	`docker-php-ext-install -j "$(nproc)" \`
`@@ -41,7 +41,8 @@ RUN set -ex; \`
`41`	`41`	`uploadprogress \`
`42`	`42`	`; \`
`43`	`43`	`\`
`44`		`- rm -r /usr/src/php/ext/uploadprogress; \`
	`44`	`+ rm -rf /usr/src/php/ext/uploadprogress; \`
	`45`	`+ rm -f /usr/src/php/ext/uploadprogress.tar.gz; \`
`45`	`46`	`\`
`46`	`47`	`apt-mark auto '.*' > /dev/null; \`
`47`	`48`	`apt-mark manual $savedAptMark; \`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ RUN set -ex; \`
`24`	`24`	`; \`
`25`	`25`	`\`
`26`	`26`	`mkdir -p /usr/src/php/ext/uploadprogress; \`
`27`		`- curl -fsSL -o uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
`28`		`- echo "$UPLOAD_PROGRESS_SHA256 uploadprogress.tar.gz" \| sha256sum -c -; \`
`29`		`- tar -xf uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
	`27`	`+ curl -fsSL -o /usr/src/php/ext/uploadprogress.tar.gz "$UPLOAD_PROGRESS_EXT_URL"; \`
	`28`	`+ echo "$UPLOAD_PROGRESS_SHA256 /usr/src/php/ext/uploadprogress.tar.gz" \| sha256sum -c -; \`
	`29`	`+ tar -xf /usr/src/php/ext/uploadprogress.tar.gz -C /usr/src/php/ext/uploadprogress --strip-components=1; \`
`30`	`30`	`\`
`31`	`31`	`docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \`
`32`	`32`	`docker-php-ext-install -j "$(nproc)" \`
`@@ -39,7 +39,8 @@ RUN set -ex; \`
`39`	`39`	`uploadprogress \`
`40`	`40`	`; \`
`41`	`41`	`\`
`42`		`- rm -r /usr/src/php/ext/uploadprogress; \`
	`42`	`+ rm -rf /usr/src/php/ext/uploadprogress; \`
	`43`	`+ rm -f /usr/src/php/ext/uploadprogress.tar.gz; \`
`43`	`44`	`\`
`44`	`45`	`runDeps="$( \`
`45`	`46`	`scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \`