diff --git a/Dockerfile b/Dockerfile index 8a481a1..3542474 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,8 @@ RUN \ sudo && \ echo "**** install openssh-server ****" && \ if [ -z ${OPENSSH_RELEASE+x} ]; then \ - OPENSSH_RELEASE=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/ \ - | awk -F '(openssh-server-|.apk)' '/openssh-server.*.apk/ {print $2; exit}'); \ + OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:openssh-server$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ openssh-client==${OPENSSH_RELEASE} \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 021f87d..1f69a84 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,8 +16,8 @@ RUN \ sudo && \ echo "**** install openssh-server ****" && \ if [ -z ${OPENSSH_RELEASE+x} ]; then \ - OPENSSH_RELEASE=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/ \ - | awk -F '(openssh-server-|.apk)' '/openssh-server.*.apk/ {print $2; exit}'); \ + OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:openssh-server$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ openssh-client==${OPENSSH_RELEASE} \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 30c5e9b..df0fdde 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -16,8 +16,8 @@ RUN \ sudo && \ echo "**** install openssh-server ****" && \ if [ -z ${OPENSSH_RELEASE+x} ]; then \ - OPENSSH_RELEASE=$(curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/ \ - | awk -F '(openssh-server-|.apk)' '/openssh-server.*.apk/ {print $2; exit}'); \ + OPENSSH_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:openssh-server$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ openssh-client==${OPENSSH_RELEASE} \ diff --git a/jenkins-vars.yml b/jenkins-vars.yml index fd59d55..ac8a867 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,8 +2,7 @@ # jenkins variables project_name: docker-openssh-server -external_type: na -custom_version_command: "curl -s http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/ |awk -F '(openssh-server-|.apk)' '/openssh-server.*.apk/ {print $2; exit}'" +external_type: alpine_repo release_type: stable release_tag: latest ls_branch: master @@ -16,6 +15,9 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/openssh-server' - PR_DOCKERHUB_IMAGE = 'lspipepr/openssh-server' - DIST_IMAGE = 'alpine' + - DIST_TAG = '3.13' + - DIST_REPO = 'http://nl.alpinelinux.org/alpine/v3.13/main/' + - DIST_REPO_PACKAGES = 'openssh-server' - MULTIARCH='true' - CI='true' - CI_WEB='false'