diff --git a/Dockerfile b/Dockerfile index d8eed1a..eaf457f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,16 @@ FROM alpine as build -ARG ALPINE_VERSION -ENV ALPINE_MIRROR https://uk.alpinelinux.org/alpine/v3.8 + +ARG VERSION +ENV ALPINE_SERIES 3.9 +ENV ALPINE_MIRROR https://uk.alpinelinux.org/alpine/v${ALPINE_SERIES} ENV ALPINE_ARCH x86_64 + WORKDIR /root -RUN apk add --no-cache curl &&\ - curl -LO ${ALPINE_MIRROR}/releases/${ALPINE_ARCH}/alpine-minirootfs-${ALPINE_VERSION}-${ALPINE_ARCH}.tar.gz &&\ +RUN set -x; apk add --no-cache curl &&\ + curl -LO ${ALPINE_MIRROR}/releases/${ALPINE_ARCH}/alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz &&\ mkdir /dest &&\ - tar -C /dest -xvzf alpine-minirootfs-${ALPINE_VERSION}-${ALPINE_ARCH}.tar.gz &&\ - sed -i "s#http://dl-cdn.alpinelinux.org/alpine/v3.8#${ALPINE_MIRROR}#g" /dest/etc/apk/repositories + tar -C /dest -xvzf alpine-minirootfs-${VERSION}-${ALPINE_ARCH}.tar.gz &&\ + sed -i "s#http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_SERIES}#${ALPINE_MIRROR}#g" /dest/etc/apk/repositories FROM scratch COPY --from=build /dest / diff --git a/Jenkinsfile b/Jenkinsfile index 34118b8..178b946 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ 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", "--build-arg ALPINE_VERSION=$env.BRANCH_NAME .") + def customImage = docker.build("reg.zknt.org/zknt/alpine", "--build-arg 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]) diff --git a/README.md b/README.md index 2372177..bacdc34 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ stock alpine ============ -Last update: 2018-12-23 +Last update: 2019-03-05