diff --git a/Dockerfile b/Dockerfile index b5a505f..d8eed1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine as build +ARG ALPINE_VERSION ENV ALPINE_MIRROR https://uk.alpinelinux.org/alpine/v3.8 -ENV ALPINE_VERSION 3.8.1 ENV ALPINE_ARCH x86_64 WORKDIR /root RUN apk add --no-cache curl &&\ diff --git a/Jenkinsfile b/Jenkinsfile index eb0ed86..34118b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,8 +6,11 @@ pipeline { withDockerRegistry([ credentialsId: "6ff44976-23cd-4cc2-902c-de8c340e65e5", url: "https://reg.zknt.org" ]) { echo 'Starting to build docker image' script { - def customImage = docker.build("reg.zknt.org/zknt/alpine:3.8.1") - customImage.push() + def customImage = docker.build("reg.zknt.org/zknt/alpine", "--build-arg ALPINE_VERSION=$env.BRANCH_NAME .") + customImage.push(env.BRANCH_NAME) + customImage.push(env.BRANCH_NAME.split(/\./)[0,1].join('.')) + customImage.push(env.BRANCH_NAME.split(/\./)[0]) + customImage.push("latest") } } } diff --git a/README.md b/README.md index 31433c4..2372177 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ stock alpine ============ -Last update: 2018-11-26 +Last update: 2018-12-23