update php 7.4.30-fpm-alpine

Signed-off-by: yzewei <[email protected]>
Loongson-Cloud-Community · Dec 24, 2024 · e205574 · e205574
1 parent 4ca4685
commit e205574
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/library/php/7.4.30-fpm-alpine/Dockerfile b/library/php/7.4.30-fpm-alpine/Dockerfile
@@ -27,6 +27,7 @@ RUN apk add --no-cache \
 		tar \
 		xz \
 		patch \
+		wget \
 # https://github.com/docker-library/php/issues/494
 		openssl
 
@@ -70,7 +71,7 @@ RUN set -eux; \
 	mkdir -p /usr/src; \
 	cd /usr/src; \
 	\
-	curl -fsSL -o php.tar.xz "$PHP_URL"; \
+	wget -O php.tar.xz "$PHP_URL"; \
 	\
 	if [ -n "$PHP_SHA256" ]; then \
 		echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
@@ -107,6 +108,7 @@ RUN set -eux; \
 		openssl-dev \
 		readline-dev \
 		sqlite-dev \
+		php-pear \
 	; \
 	\
 # make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
@@ -202,9 +204,9 @@ RUN set -eux; \
 	apk del --no-network .build-deps; \
 	\
 # update pecl channel definitions https://github.com/docker-library/php/issues/443
-	pecl update-channels; \
-	rm -rf /tmp/pear ~/.pearrc; \
-	\
+#	pecl update-channels; \
+#	rm -rf /tmp/pear ~/.pearrc; \
+#	\
 # smoke test
 	php --version
 

diff --git a/library/php/7.4.30-fpm-alpine/Makefile b/library/php/7.4.30-fpm-alpine/Makefile
@@ -12,6 +12,8 @@ default: image
 
 image:
 	docker build \
+		--build-arg http_proxy=$(http_proxy) \
+		--build-arg https_proxy=$(https_proxy) \
 		-t $(IMAGE) \
 		.