diff --git a/Dockerfile b/Dockerfile index 36ae0f8..c75b96d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.10 as rootfs-stage # environment -ENV REL=v3.10 +ENV REL=v3.11 ENV ARCH=x86_64 ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 338204c..441ba27 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,7 +1,7 @@ FROM alpine:3.10 as rootfs-stage # environment -ENV REL=v3.10 +ENV REL=v3.11 ENV ARCH=aarch64 ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a6e226e..b99c3e5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,7 +1,7 @@ FROM alpine:3.10 as rootfs-stage # environment -ENV REL=v3.10 +ENV REL=v3.11 ENV ARCH=armv7 ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ diff --git a/Jenkinsfile b/Jenkinsfile index 7f4e817..32cd1ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,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.10 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.11 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' ''', @@ -545,14 +545,14 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:3.10 - docker push ${PUSHIMAGE}:3.10 + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:3.11 + docker push ${PUSHIMAGE}:3.11 docker push ${PUSHIMAGE}:${META_TAG} done for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:3.10 || : + ${DELETEIMAGE}:3.11 || : done ''' } @@ -595,41 +595,41 @@ pipeline { docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-3.10 - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-3.10 - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-3.10 + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-3.11 + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-3.11 + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-3.11 docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-3.10 - docker push ${MANIFESTIMAGE}:arm32v7-3.10 - docker push ${MANIFESTIMAGE}:arm64v8-3.10 - docker manifest push --purge ${MANIFESTIMAGE}:3.10 || : - docker manifest create ${MANIFESTIMAGE}:3.10 ${MANIFESTIMAGE}:amd64-3.10 ${MANIFESTIMAGE}:arm32v7-3.10 ${MANIFESTIMAGE}:arm64v8-3.10 - docker manifest annotate ${MANIFESTIMAGE}:3.10 ${MANIFESTIMAGE}:arm32v7-3.10 --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:3.10 ${MANIFESTIMAGE}:arm64v8-3.10 --os linux --arch arm64 --variant v8 + docker push ${MANIFESTIMAGE}:amd64-3.11 + docker push ${MANIFESTIMAGE}:arm32v7-3.11 + docker push ${MANIFESTIMAGE}:arm64v8-3.11 + docker manifest push --purge ${MANIFESTIMAGE}:3.11 || : + docker manifest create ${MANIFESTIMAGE}:3.11 ${MANIFESTIMAGE}:amd64-3.11 ${MANIFESTIMAGE}:arm32v7-3.11 ${MANIFESTIMAGE}:arm64v8-3.11 + docker manifest annotate ${MANIFESTIMAGE}:3.11 ${MANIFESTIMAGE}:arm32v7-3.11 --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:3.11 ${MANIFESTIMAGE}:arm64v8-3.11 --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:3.10 + docker manifest push --purge ${MANIFESTIMAGE}:3.11 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:3.10 + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:3.11 docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-3.10 - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-3.10 + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-3.11 + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-3.11 docker push ${LEGACYIMAGE}:amd64-${META_TAG} docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:3.10 + docker push ${LEGACYIMAGE}:3.11 docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-3.10 - docker push ${LEGACYIMAGE}:arm64v8-3.10 + docker push ${LEGACYIMAGE}:arm32v7-3.11 + docker push ${LEGACYIMAGE}:arm64v8-3.11 done ''' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index b8ea479..33a59ce 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.10" +release_tag: "3.11" ls_branch: master repo_vars: - BUILD_VERSION_ARG = 'OS'