From 8c1afcc92ac55b9bed1f7a06ca95ba69090c43ba Mon Sep 17 00:00:00 2001 From: Jean-Philippe Menil Date: Fri, 25 Feb 2022 15:23:52 +0100 Subject: [PATCH 1/2] Dockerfile: fix labels Signed-off-by: Jean-Philippe Menil --- Makefile | 2 +- alpine/latest/Dockerfile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ff722aaf..869e49eb 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ export DOCKER_BUILD_ARGS= --build-arg CURL_CONFIGURE_OPTION=${CONFIGURE_BUILD_OP --build-arg CURL_RELEASE_TAG=${LATEST_RELEASE_TAG} \ --build-arg CURL_RELEASE_VERSION=${LATEST_RELEASE_VERSION} \ --build-arg CURL_GIT_REPO=https://github.com/curl/curl.git \ - --label Name=curl --label Version=1.0.0 \ + --label name=curl --label version=1.0.0 \ --label se.haxx.curl=curl \ --label se.haxx.curl.version=${LATEST_RELEASE_VERSION} \ --label se.haxx.curl.release_tag=${LATEST_RELEASE_TAG} \ diff --git a/alpine/latest/Dockerfile b/alpine/latest/Dockerfile index 587e4fa2..608e74f7 100644 --- a/alpine/latest/Dockerfile +++ b/alpine/latest/Dockerfile @@ -64,10 +64,10 @@ ENV CURL_GIT_REPO ${CURL_GIT_REPO} ############################################################### # define docker labels ############################################################### -LABEL Maintainer="James Fuller " -LABEL Name="curl" -LABEL Version="${LABEL_VERSION}" -LABEL docker.cmd="docker run -it curl/curl:7.82.0 -s -L http://curl.se" +LABEL maintainer="James Fuller " +LABEL name="${LABEL_NAME}" +LABEL version="${LABEL_VERSION}" +LABEL docker.cmd="docker run -it curl/curl:7.78.0 -s -L http://curl.se" ############################################################### # dependencies From 217130602749b89b1aa89e5fc084ffe7f6237ae9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Menil Date: Fri, 25 Mar 2022 09:29:32 +0100 Subject: [PATCH 2/2] fixup! Dockerfile: fix labels Signed-off-by: Jean-Philippe Menil --- alpine/latest/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/latest/Dockerfile b/alpine/latest/Dockerfile index 608e74f7..f7dfecbe 100644 --- a/alpine/latest/Dockerfile +++ b/alpine/latest/Dockerfile @@ -67,7 +67,7 @@ ENV CURL_GIT_REPO ${CURL_GIT_REPO} LABEL maintainer="James Fuller " LABEL name="${LABEL_NAME}" LABEL version="${LABEL_VERSION}" -LABEL docker.cmd="docker run -it curl/curl:7.78.0 -s -L http://curl.se" +LABEL docker.cmd="docker run -it curl/curl:7.82.0 -s -L http://curl.se" ############################################################### # dependencies