From fc92f216c25e5d8bddca8c1c3397f2ad16594ff9 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 17 Mar 2020 12:30:31 -0700 Subject: [PATCH] adding openbox bionic flavor --- Dockerfile | 6 ++-- Dockerfile.aarch64 | 6 ++-- Dockerfile.armhf | 6 ++-- Jenkinsfile | 80 +++++++++++++++++++++++----------------------- jenkins-vars.yml | 5 ++- 5 files changed, 48 insertions(+), 55 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0e3f992..06fc89cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/rdesktop:focal +FROM lsiobase/rdesktop:bionic # set version label ARG BUILD_DATE @@ -14,10 +14,8 @@ RUN \ firefox \ obconf \ openbox \ - python2-minimal \ + python \ xterm && \ - cd /usr/bin && \ - ln -s python2 python && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4cc6273b..037cd23c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/rdesktop:arm64v8-focal +FROM lsiobase/rdesktop:arm64v8-bionic # set version label ARG BUILD_DATE @@ -14,10 +14,8 @@ RUN \ firefox \ obconf \ openbox \ - python2-minimal \ + python \ xterm && \ - cd /usr/bin && \ - ln -s python2 python && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3f981172..9611c972 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/rdesktop:arm32v7-focal +FROM lsiobase/rdesktop:arm32v7-bionic # set version label ARG BUILD_DATE @@ -14,10 +14,8 @@ RUN \ firefox \ obconf \ openbox \ - python2-minimal \ + python \ xterm && \ - cd /usr/bin && \ - ln -s python2 python && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index baf2013f..63497f29 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}':openbox-focal 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}':openbox-bionic 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' ''', @@ -117,10 +117,10 @@ pipeline { } } } - // If this is a openbox-focal build use live docker endpoints + // If this is a openbox-bionic build use live docker endpoints stage("Set ENV live build"){ when { - branch "openbox-focal" + branch "openbox-bionic" environment name: 'CHANGE_ID', value: '' } steps { @@ -141,7 +141,7 @@ pipeline { // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "openbox-focal"} + not {branch "openbox-bionic"} environment name: 'CHANGE_ID', value: '' } steps { @@ -214,7 +214,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "openbox-focal" + branch "openbox-bionic" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -225,7 +225,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=openbox-focal -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=openbox-bionic -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -233,7 +233,7 @@ pipeline { mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f openbox-focal + git checkout -f openbox-bionic cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ @@ -265,7 +265,7 @@ pipeline { // Exit the build if the Templated files were just updated stage('Template-exit') { when { - branch "openbox-focal" + branch "openbox-bionic" environment name: 'CHANGE_ID', value: '' environment name: 'FILES_UPDATED', value: 'true' expression { @@ -327,7 +327,7 @@ pipeline { } stage('Build ARMHF') { agent { - label 'X86-64-MULTI' + label 'ARMHF' } steps { withCredentials([ @@ -354,7 +354,7 @@ pipeline { } stage('Build ARM64') { agent { - label 'X86-64-MULTI' + label 'ARM64' } steps { withCredentials([ @@ -384,7 +384,7 @@ pipeline { // Take the image we just built and dump package versions for comparison stage('Update-packages') { when { - branch "openbox-focal" + branch "openbox-bionic" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -412,7 +412,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 openbox-focal + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f openbox-bionic cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ wait @@ -436,7 +436,7 @@ pipeline { // Exit the build if the package file was just updated stage('PACKAGE-exit') { when { - branch "openbox-focal" + branch "openbox-bionic" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'EXIT_STATUS', value: '' @@ -450,7 +450,7 @@ pipeline { // Exit the build if this is just a package check and there are no changes to push stage('PACKAGECHECK-exit') { when { - branch "openbox-focal" + branch "openbox-bionic" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'EXIT_STATUS', value: '' @@ -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}:openbox-focal - docker push ${PUSHIMAGE}:openbox-focal + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:openbox-bionic + docker push ${PUSHIMAGE}:openbox-bionic docker push ${PUSHIMAGE}:${META_TAG} done for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:openbox-focal || : + ${DELETEIMAGE}:openbox-bionic || : done ''' } @@ -595,52 +595,52 @@ 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-openbox-focal - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-openbox-focal - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-openbox-focal + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-openbox-bionic + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-openbox-bionic + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-openbox-bionic docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-openbox-focal - docker push ${MANIFESTIMAGE}:arm32v7-openbox-focal - docker push ${MANIFESTIMAGE}:arm64v8-openbox-focal - docker manifest push --purge ${MANIFESTIMAGE}:openbox-focal || : - docker manifest create ${MANIFESTIMAGE}:openbox-focal ${MANIFESTIMAGE}:amd64-openbox-focal ${MANIFESTIMAGE}:arm32v7-openbox-focal ${MANIFESTIMAGE}:arm64v8-openbox-focal - docker manifest annotate ${MANIFESTIMAGE}:openbox-focal ${MANIFESTIMAGE}:arm32v7-openbox-focal --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:openbox-focal ${MANIFESTIMAGE}:arm64v8-openbox-focal --os linux --arch arm64 --variant v8 + docker push ${MANIFESTIMAGE}:amd64-openbox-bionic + docker push ${MANIFESTIMAGE}:arm32v7-openbox-bionic + docker push ${MANIFESTIMAGE}:arm64v8-openbox-bionic + docker manifest push --purge ${MANIFESTIMAGE}:openbox-bionic || : + docker manifest create ${MANIFESTIMAGE}:openbox-bionic ${MANIFESTIMAGE}:amd64-openbox-bionic ${MANIFESTIMAGE}:arm32v7-openbox-bionic ${MANIFESTIMAGE}:arm64v8-openbox-bionic + docker manifest annotate ${MANIFESTIMAGE}:openbox-bionic ${MANIFESTIMAGE}:arm32v7-openbox-bionic --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:openbox-bionic ${MANIFESTIMAGE}:arm64v8-openbox-bionic --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}:openbox-focal + docker manifest push --purge ${MANIFESTIMAGE}:openbox-bionic 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}:openbox-focal + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:openbox-bionic docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-openbox-focal - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-openbox-focal + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-openbox-bionic + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-openbox-bionic docker push ${LEGACYIMAGE}:amd64-${META_TAG} docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:openbox-focal + docker push ${LEGACYIMAGE}:openbox-bionic docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-openbox-focal - docker push ${LEGACYIMAGE}:arm64v8-openbox-focal + docker push ${LEGACYIMAGE}:arm32v7-openbox-bionic + docker push ${LEGACYIMAGE}:arm64v8-openbox-bionic done ''' sh '''#! /bin/bash for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-openbox-focal \ + ${DELETEIMAGE}:amd64-openbox-bionic \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-openbox-focal \ + ${DELETEIMAGE}:arm32v7-openbox-bionic \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-openbox-focal || : + ${DELETEIMAGE}:arm64v8-openbox-bionic || : done docker rmi \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -652,7 +652,7 @@ pipeline { // If this is a public release tag it in the LS Github stage('Github-Tag-Push-Release') { when { - branch "openbox-focal" + branch "openbox-bionic" expression { env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -664,14 +664,14 @@ 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}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to openbox-focal",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to openbox-bionic",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "openbox-focal",\ + "target_commitish": "openbox-bionic",\ "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**OS Changes:**\\n\\n' > start printf '","draft": false,"prerelease": true}' >> releasebody.json diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 2b93a2f5..19d491d1 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -4,9 +4,8 @@ project_name: docker-rdesktop external_type: os release_type: prerelease -release_tag: openbox-focal -ls_branch: openbox-focal -use_qemu: true +release_tag: openbox-bionic +ls_branch: openbox-bionic repo_vars: - BUILD_VERSION_ARG = 'OS_VERSION' - LS_USER = 'linuxserver'