diff --git a/Dockerfile b/Dockerfile index 8192539..f595704 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,10 @@ COPY tcpping /defaults/ RUN \ echo "**** install packages ****" && \ + if [ -z ${SMOKEPING_VERSION+x} ]; then \ + SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ + fi && \ apk add --no-cache \ apache2 \ apache2-ctl \ @@ -22,7 +26,7 @@ RUN \ curl \ font-noto-cjk \ openssh-client \ - smokeping \ + smokeping==${SMOKEPING_VERSION} \ ssmtp \ sudo \ tcptraceroute \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d66521a..490fee4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,6 +12,10 @@ COPY tcpping /defaults/ RUN \ echo "**** install packages ****" && \ + if [ -z ${SMOKEPING_VERSION+x} ]; then \ + SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ + fi && \ apk add --no-cache \ apache2 \ apache2-ctl \ @@ -22,7 +26,7 @@ RUN \ curl \ font-noto-cjk \ openssh-client \ - smokeping \ + smokeping==${SMOKEPING_VERSION} \ ssmtp \ sudo \ tcptraceroute \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index be9f85b..9e6313e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,6 +12,10 @@ COPY tcpping /defaults/ RUN \ echo "**** install packages ****" && \ + if [ -z ${SMOKEPING_VERSION+x} ]; then \ + SMOKEPING_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + && awk '/^P:smokeping$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ + fi && \ apk add --no-cache \ apache2 \ apache2-ctl \ @@ -22,7 +26,7 @@ RUN \ curl \ font-noto-cjk \ openssh-client \ - smokeping \ + smokeping==${SMOKEPING_VERSION} \ ssmtp \ sudo \ tcptraceroute \ diff --git a/jenkins-vars.yml b/jenkins-vars.yml index fd2cfe4..aed843c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,7 @@ # jenkins variables project_name: docker-smokeping -external_type: os +external_type: alpine_repo release_type: stable release_tag: latest ls_branch: master @@ -15,6 +15,9 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/smokeping' - PR_DOCKERHUB_IMAGE = 'lspipepr/smokeping' - DIST_IMAGE = 'alpine' + - DIST_TAG = '3.13' + - DIST_REPO = 'http://nl.alpinelinux.org/alpine/v3.13/main/' + - DIST_REPO_PACKAGES = 'smokeping' - MULTIARCH='true' - CI='true' - CI_WEB='true'