Skip to content

Commit 4855856

Browse files
committed
Remove superfluous uploadprogress.tar.gz
Signed-off-by: Daniel Rudolf <[email protected]>
1 parent fc38d23 commit 4855856

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

Dockerfile-alpine.template

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ RUN set -ex; \
2323
; \
2424
\
2525
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; \
2929
\
3030
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
3131
docker-php-ext-install -j "$(nproc)" \
@@ -39,6 +39,7 @@ RUN set -ex; \
3939
; \
4040
\
4141
rm -r /usr/src/php/ext/uploadprogress; \
42+
rm /usr/src/php/ext/uploadprogress.tar.gz; \
4243
\
4344
runDeps="$( \
4445
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \

Dockerfile-debian.template

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN set -ex; \
2525
; \
2626
\
2727
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; \
3131
\
3232
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
3333
docker-php-ext-install -j "$(nproc)" \
@@ -41,6 +41,7 @@ RUN set -ex; \
4141
; \
4242
\
4343
rm -r /usr/src/php/ext/uploadprogress; \
44+
rm /usr/src/php/ext/uploadprogress.tar.gz; \
4445
\
4546
apt-mark auto '.*' > /dev/null; \
4647
apt-mark manual $savedAptMark; \

apache/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ RUN set -ex; \
2626
; \
2727
\
2828
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; \
3232
\
3333
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
3434
docker-php-ext-install -j "$(nproc)" \
@@ -42,6 +42,7 @@ RUN set -ex; \
4242
; \
4343
\
4444
rm -r /usr/src/php/ext/uploadprogress; \
45+
rm /usr/src/php/ext/uploadprogress.tar.gz; \
4546
\
4647
apt-mark auto '.*' > /dev/null; \
4748
apt-mark manual $savedAptMark; \

fpm-alpine/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ RUN set -ex; \
2424
; \
2525
\
2626
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; \
3030
\
3131
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
3232
docker-php-ext-install -j "$(nproc)" \
@@ -40,6 +40,7 @@ RUN set -ex; \
4040
; \
4141
\
4242
rm -r /usr/src/php/ext/uploadprogress; \
43+
rm /usr/src/php/ext/uploadprogress.tar.gz; \
4344
\
4445
runDeps="$( \
4546
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \

fpm/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ RUN set -ex; \
2626
; \
2727
\
2828
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; \
3232
\
3333
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
3434
docker-php-ext-install -j "$(nproc)" \
@@ -42,6 +42,7 @@ RUN set -ex; \
4242
; \
4343
\
4444
rm -r /usr/src/php/ext/uploadprogress; \
45+
rm /usr/src/php/ext/uploadprogress.tar.gz; \
4546
\
4647
apt-mark auto '.*' > /dev/null; \
4748
apt-mark manual $savedAptMark; \

0 commit comments

Comments
 (0)