From 5cf0d3aed49e78cf3e896760340f2608e714ab65 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 15 Mar 2019 21:52:24 -0700 Subject: [PATCH] adding 3.8 multiarch pipeline endpoint --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 6 ++--- Jenkinsfile | 62 +++++++++++++++++++++++----------------------- jenkins-vars.yml | 6 ++--- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7fb4e14..312f40e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.9 as rootfs-stage MAINTAINER sparkyballs,thelamer # environment -ENV REL=v3.9 +ENV REL=v3.8 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 d3d0b1e..9b1bc15 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM alpine:3.9 as rootfs-stage MAINTAINER sparkyballs,thelamer # environment -ENV REL=v3.9 +ENV REL=v3.8 ENV ARCH=aarch64 ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b17f352..a33b360 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -2,8 +2,8 @@ FROM alpine:3.9 as rootfs-stage MAINTAINER sparkyballs,thelamer # environment -ENV REL=v3.9 -ENV ARCH=armv7 +ENV REL=v3.8 +ENV ARCH=armhf ENV MIRROR=http://dl-cdn.alpinelinux.org/alpine ENV PACKAGES=alpine-baselayout,\ alpine-keys,\ @@ -43,7 +43,7 @@ LABEL MAINTAINER="sparkyballs,TheLamer" # set version for s6 overlay ARG OVERLAY_VERSION -ARG OVERLAY_ARCH="arm" +ARG OVERLAY_ARCH="armhf" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)# " \ diff --git a/Jenkinsfile b/Jenkinsfile index 6971f3d..da45647 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,8 +15,8 @@ pipeline { EXT_REPO = 's6-overlay' BUILD_VERSION_ARG = 'OVERLAY_VERSION' LS_USER = 'linuxserver' - LS_REPO = 'docker-base-alpine-example' - CONTAINER_NAME = 'base-alpine-example' + LS_REPO = 'docker-baseimage-alpine' + CONTAINER_NAME = 'baseimage-alpine' DOCKERHUB_IMAGE = 'lsiobase/alpine' DEV_DOCKERHUB_IMAGE = 'lsiodev/alpine' PR_DOCKERHUB_IMAGE = 'lspipepr/alpine' @@ -38,7 +38,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''', + script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name' ''', 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' ''', @@ -122,10 +122,10 @@ pipeline { } } } - // If this is a master build use live docker endpoints + // If this is a 3.8 build use live docker endpoints stage("Set ENV live build"){ when { - branch "master" + branch "3.8" environment name: 'CHANGE_ID', value: '' } steps { @@ -143,7 +143,7 @@ pipeline { // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "master"} + not {branch "3.8"} environment name: 'CHANGE_ID', value: '' } steps { @@ -297,7 +297,7 @@ pipeline { // Take the image we just built and dump package versions for comparison stage('Update-packages') { when { - branch "master" + branch "3.8" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -325,7 +325,7 @@ pipeline { echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f 3.8 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ wait @@ -349,7 +349,7 @@ pipeline { // Exit the build if the package file was just updated stage('PACKAGE-exit') { when { - branch "master" + branch "3.8" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'EXIT_STATUS', value: '' @@ -363,7 +363,7 @@ pipeline { // Exit the build if this is just a package check and there are no changes to push stage('PACKAGECHECK-exit') { when { - branch "master" + branch "3.8" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'EXIT_STATUS', value: '' @@ -447,12 +447,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.8" + sh "docker push ${IMAGE}:3.8" sh "docker push ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:${META_TAG} \ - ${IMAGE}:3.9 ''' + ${IMAGE}:3.8 ''' } } @@ -482,32 +482,32 @@ 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.8" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-3.8" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-3.8" 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.8" + sh "docker push ${IMAGE}:arm32v7-3.8" + sh "docker push ${IMAGE}:arm64v8-3.8" + sh "docker manifest push --purge ${IMAGE}:3.8 || :" + sh "docker manifest create ${IMAGE}:3.8 ${IMAGE}:amd64-3.8 ${IMAGE}:arm32v7-3.8 ${IMAGE}:arm64v8-3.8" + sh "docker manifest annotate ${IMAGE}:3.8 ${IMAGE}:arm32v7-3.8 --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:3.8 ${IMAGE}:arm64v8-3.8 --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.8" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:amd64-${META_TAG} \ - ${IMAGE}:amd64-3.9 \ + ${IMAGE}:amd64-3.8 \ ${IMAGE}:arm32v7-${META_TAG} \ - ${IMAGE}:arm32v7-3.9 \ + ${IMAGE}:arm32v7-3.8 \ ${IMAGE}:arm64v8-${META_TAG} \ - ${IMAGE}:arm64v8-3.9 \ + ${IMAGE}:arm64v8-3.8 \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } @@ -516,7 +516,7 @@ pipeline { // If this is a public release tag it in the LS Github stage('Github-Tag-Push-Release') { when { - branch "master" + branch "3.8" expression { env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER } @@ -528,17 +528,17 @@ pipeline { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ -d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to 3.8",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ + "target_commitish": "3.8",\ "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json + printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 5a9809e..6e7cf82 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,9 +3,9 @@ # jenkins variables project_name: docker-baseimage-alpine external_type: github_stable -release_type: stable -release_tag: 3.9 -ls_branch: master +release_type: prerelease +release_tag: 3.8 +ls_branch: 3.8 repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'just-containers'