From e12acbf29263abdce3bdd6536f79759c3954fc8c Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 28 Jun 2019 14:12:42 -0700 Subject: [PATCH] bump to alpine 3.10 and s6 v1.22.1.0 --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- Dockerfile.armhf | 6 +++--- Jenkinsfile | 30 +++++++++++++++--------------- jenkins-vars.yml | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index 240866e..bcbee38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:3.9 as rootfs-stage +FROM alpine:3.10 as rootfs-stage MAINTAINER sparkyballs,thelamer # environment -ENV REL=v3.9 +ENV REL=v3.10 ENV ARCH=x86_64 ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ @@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL MAINTAINER="sparkyballs,TheLamer" # set version for s6 overlay -ARG OVERLAY_VERSION="v1.22.0.0" +ARG OVERLAY_VERSION="v1.22.1.0" ARG OVERLAY_ARCH="amd64" # environment variables diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7da5921..5aedeb1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,8 +1,8 @@ -FROM alpine:3.9 as rootfs-stage +FROM alpine:3.10 as rootfs-stage MAINTAINER sparkyballs,thelamer # environment -ENV REL=v3.9 +ENV REL=v3.10 ENV ARCH=aarch64 ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ @@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL MAINTAINER="sparkyballs,TheLamer" # set version for s6 overlay -ARG OVERLAY_VERSION="v1.22.0.0" +ARG OVERLAY_VERSION="v1.22.1.0" ARG OVERLAY_ARCH="aarch64" # environment variables diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 924f778..d295219 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,8 +1,8 @@ -FROM alpine:3.9 as rootfs-stage +FROM alpine:3.10 as rootfs-stage MAINTAINER sparkyballs,thelamer # environment -ENV REL=v3.9 +ENV REL=v3.10 ENV ARCH=armv7 ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ @@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL MAINTAINER="sparkyballs,TheLamer" # set version for s6 overlay -ARG OVERLAY_VERSION="v1.22.0.0" +ARG OVERLAY_VERSION="v1.22.1.0" ARG OVERLAY_ARCH="arm" # environment variables diff --git a/Jenkinsfile b/Jenkinsfile index 9b8f0c1..4fd79c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.9 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.1 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -507,12 +507,12 @@ pipeline { sh '''#! /bin/bash echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:3.9" - sh "docker push ${IMAGE}:3.9" + sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:3.1" + sh "docker push ${IMAGE}:3.1" sh "docker push ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:${META_TAG} \ - ${IMAGE}:3.9 || :''' + ${IMAGE}:3.1 || :''' } } @@ -542,24 +542,24 @@ pipeline { docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi''' - sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-3.9" - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-3.9" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-3.9" + sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-3.1" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-3.1" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-3.1" sh "docker push ${IMAGE}:amd64-${META_TAG}" sh "docker push ${IMAGE}:arm32v7-${META_TAG}" sh "docker push ${IMAGE}:arm64v8-${META_TAG}" - sh "docker push ${IMAGE}:amd64-3.9" - sh "docker push ${IMAGE}:arm32v7-3.9" - sh "docker push ${IMAGE}:arm64v8-3.9" - sh "docker manifest push --purge ${IMAGE}:3.9 || :" - sh "docker manifest create ${IMAGE}:3.9 ${IMAGE}:amd64-3.9 ${IMAGE}:arm32v7-3.9 ${IMAGE}:arm64v8-3.9" - sh "docker manifest annotate ${IMAGE}:3.9 ${IMAGE}:arm32v7-3.9 --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:3.9 ${IMAGE}:arm64v8-3.9 --os linux --arch arm64 --variant v8" + sh "docker push ${IMAGE}:amd64-3.1" + sh "docker push ${IMAGE}:arm32v7-3.1" + sh "docker push ${IMAGE}:arm64v8-3.1" + sh "docker manifest push --purge ${IMAGE}:3.1 || :" + sh "docker manifest create ${IMAGE}:3.1 ${IMAGE}:amd64-3.1 ${IMAGE}:arm32v7-3.1 ${IMAGE}:arm64v8-3.1" + sh "docker manifest annotate ${IMAGE}:3.1 ${IMAGE}:arm32v7-3.1 --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:3.1 ${IMAGE}:arm64v8-3.1 --os linux --arch arm64 --variant v8" sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:3.9" + sh "docker manifest push --purge ${IMAGE}:3.1" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" } } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f5679fb..5fe4820 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -4,7 +4,7 @@ project_name: docker-baseimage-alpine external_type: os release_type: stable -release_tag: 3.9 +release_tag: 3.10 ls_branch: master repo_vars: - BUILD_VERSION_ARG = 'OS'