bump to curl 7.84.0 + cherry-pick (33fd57, 50efb08, e631f6e, 5a1a89, …

…e2e7f54)

Makefile

@@ -2,7 +2,7 @@
 # set options
 #***************************************************************************
 
-export LATEST_RELEASE_VERSION=7_83_1
+export LATEST_RELEASE_VERSION=7_84_0
 export LATEST_RELEASE_TAG=curl-${LATEST_RELEASE_VERSION}
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
@@ -24,7 +24,7 @@ export DOCKER_BUILD_ARGS= --build-arg CURL_CONFIGURE_OPTION=${CONFIGURE_BUILD_OP
     --label se.haxx.curl.release_tag=${LATEST_RELEASE_TAG} \
     --label se.haxx.curl.description="network utility"
 
-export DOCKER_MULTI_ARCH=linux/arm,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386
+export DOCKER_MULTI_ARCH=linux/arm/v7,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386
 
 #***************************************************************************
 # build docker images

alpine/latest/Dockerfile

@@ -69,12 +69,12 @@ ENV CURL_GIT_REPO ${CURL_GIT_REPO}
 LABEL Maintainer="James Fuller <[email protected]>"
 LABEL Name="curl"
 LABEL Version="${LABEL_VERSION}"
-LABEL docker.cmd="docker run -it curl/curl:7.83.1 -s -L http://curl.se"
+LABEL docker.cmd="docker run -it curl/curl:7.84.0 -s -L http://curl.se"
 
 ###############################################################
 # dependencies
 ###############################################################
-RUN apk update
+# RUN apk update
 RUN apk upgrade
 RUN apk add --no-cache brotli brotli-dev libssh2 nghttp2-dev && \
     rm -fr /var/cache/apk/*

alpine/latest/Makefile

@@ -2,8 +2,8 @@ build:
 	docker build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curl/curl:${LATEST_RELEASE_VERSION}" -f Dockerfile .
 
 multibuild:
-	docker buildx build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curlimages/curl:7.83.1" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
-	docker buildx imagetools create docker.io/curlimages/curl:7.83.1 --tag curlimages/curl:latest
+	docker buildx build ${DOCKER_BUILD_OPTS} ${DOCKER_BUILD_ARGS} -t "curlimages/curl:7.84.0" --platform=${DOCKER_MULTI_ARCH} -f Dockerfile . --push
+	docker buildx imagetools create docker.io/curlimages/curl:7.84.0 --tag curlimages/curl:latest
 
 lint:
 	docker run --rm --privileged -v ${PWD}:/root/ projectatomic/dockerfile-lint dockerfile_lint -p -f Dockerfile
@@ -13,8 +13,8 @@ test:
 	docker run --rm curl/curl:${LATEST_RELEASE_VERSION} -S http://httpbin.org/get
 
 push-registry:
-	docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.83.1
-	docker push curlimages/curl:7.83.1
+	docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:7.84.0
+	docker push curlimages/curl:7.84.0
 	docker tag curl/curl:${LATEST_RELEASE_VERSION} curlimages/curl:latest
 	docker push curlimages/curl:latest