From a78b12001e76ed36b22fa136f06e03f1acc37a71 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 20 Jan 2019 00:54:59 -0800 Subject: [PATCH 1/2] adding pipeline logic and multi arching --- Dockerfile | 17 +- Dockerfile.aarch64 | 41 +++ Dockerfile.armhf | 41 +++ Jenkinsfile | 603 +++++++++++++++++++++++++++++++++++++++++++++ README.md | 7 +- jenkins-vars.yml | 29 +++ readme-vars.yml | 101 ++++++++ 7 files changed, 833 insertions(+), 6 deletions(-) create mode 100644 Dockerfile.aarch64 create mode 100644 Dockerfile.armhf create mode 100644 Jenkinsfile create mode 100644 jenkins-vars.yml create mode 100644 readme-vars.yml diff --git a/Dockerfile b/Dockerfile index 8da07ba..29f2bb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,19 +3,32 @@ FROM lsiobase/alpine.python:3.8 # set version label ARG BUILD_DATE ARG VERSION +ARG HTPCMANAGER_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" RUN \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + jq && \ echo "**** install pip packages ****" && \ pip install --no-cache-dir -U \ cherrypy && \ echo "**** install app ****" && \ - git clone --depth 1 https://github.com/Hellowlol/HTPC-Manager.git /app/htpcmanager && \ + if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ + HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/Hellowlol/HTPC-Manager/commits/master2 \ + | jq -r '. | .sha'); \ + fi && \ + mkdir -p /app/htpcmanager && \ + cd /app/htpcmanager && \ + git init && \ + git remote add origin https://github.com/Hellowlol/HTPC-Manager.git && \ + git fetch --depth 1 origin ${HTPCMANAGER_COMMIT} && \ + git checkout FETCH_HEAD && \ echo "**** cleanup ****" && \ rm -rf \ /root/.cache \ -/tmp/* + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 new file mode 100644 index 0000000..72773ef --- /dev/null +++ b/Dockerfile.aarch64 @@ -0,0 +1,41 @@ +FROM lsiobase/alpine.python.arm64:3.8 + +# Add qemu to build on x86_64 systems +COPY qemu-aarch64-static /usr/bin + +# set version label +ARG BUILD_DATE +ARG VERSION +ARG HTPCMANAGER_COMMIT +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="sparklyballs" + +RUN \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + jq && \ + echo "**** install pip packages ****" && \ + pip install --no-cache-dir -U \ + cherrypy && \ + echo "**** install app ****" && \ + if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ + HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/Hellowlol/HTPC-Manager/commits/master2 \ + | jq -r '. | .sha'); \ + fi && \ + mkdir -p /app/htpcmanager && \ + cd /app/htpcmanager && \ + git init && \ + git remote add origin https://github.com/Hellowlol/HTPC-Manager.git && \ + git fetch --depth 1 origin ${HTPCMANAGER_COMMIT} && \ + git checkout FETCH_HEAD && \ + echo "**** cleanup ****" && \ + rm -rf \ + /root/.cache \ + /tmp/* + +# add local files +COPY root/ / + +# ports and volumes +EXPOSE 8085 +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf new file mode 100644 index 0000000..6ae349b --- /dev/null +++ b/Dockerfile.armhf @@ -0,0 +1,41 @@ +FROM lsiobase/alpine.python.armhf:3.8 + +# Add qemu to build on x86_64 systems +COPY qemu-arm-static /usr/bin + +# set version label +ARG BUILD_DATE +ARG VERSION +ARG HTPCMANAGER_COMMIT +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="sparklyballs" + +RUN \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + jq && \ + echo "**** install pip packages ****" && \ + pip install --no-cache-dir -U \ + cherrypy && \ + echo "**** install app ****" && \ + if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ + HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/Hellowlol/HTPC-Manager/commits/master2 \ + | jq -r '. | .sha'); \ + fi && \ + mkdir -p /app/htpcmanager && \ + cd /app/htpcmanager && \ + git init && \ + git remote add origin https://github.com/Hellowlol/HTPC-Manager.git && \ + git fetch --depth 1 origin ${HTPCMANAGER_COMMIT} && \ + git checkout FETCH_HEAD && \ + echo "**** cleanup ****" && \ + rm -rf \ + /root/.cache \ + /tmp/* + +# add local files +COPY root/ / + +# ports and volumes +EXPOSE 8085 +VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..04d76b2 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,603 @@ +pipeline { + agent { + label 'X86-64-MULTI' + } + // Input to determine if this is a package check + parameters { + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + } + // Configuration for the variables used for this specific repo + environment { + BUILDS_DISCORD=credentials('build_webhook_url') + GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') + EXT_GIT_BRANCH = 'master2' + EXT_USER = 'Hellowlol' + EXT_REPO = 'HTPC-Manager' + BUILD_VERSION_ARG = 'HTPCMANAGER_COMMIT' + LS_USER = 'linuxserver' + LS_REPO = 'docker-htpcmanager' + CONTAINER_NAME = 'htpcmanager' + DOCKERHUB_IMAGE = 'linuxserver/htpcmanager' + DEV_DOCKERHUB_IMAGE = 'lsiodev/htpcmanager' + PR_DOCKERHUB_IMAGE = 'lspipepr/htpcmanager' + DIST_IMAGE = 'alpine' + MULTIARCH='true' + CI='true' + CI_WEB='true' + CI_PORT='8085' + CI_SSL='false' + CI_DELAY='120' + CI_DOCKERENV='TZ=US/Pacific' + CI_AUTH='user:password' + CI_WEBPATH='' + } + stages { + // Setup all the basic environment variables needed for the build + stage("Set ENV Variables base"){ + steps{ + 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' ''', + returnStdout: true).trim() + env.LS_RELEASE_NOTES = sh( + script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', + returnStdout: true).trim() + env.GITHUB_DATE = sh( + script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', + returnStdout: true).trim() + env.COMMIT_SHA = sh( + script: '''git rev-parse HEAD''', + returnStdout: true).trim() + env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT + env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' + env.PULL_REQUEST = env.CHANGE_ID + } + script{ + env.LS_RELEASE_NUMBER = sh( + script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', + returnStdout: true).trim() + } + script{ + env.LS_TAG_NUMBER = sh( + script: '''#! /bin/bash + tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null) + if [ "${tagsha}" == "${COMMIT_SHA}" ]; then + echo ${LS_RELEASE_NUMBER} + elif [ -z "${GIT_COMMIT}" ]; then + echo ${LS_RELEASE_NUMBER} + else + echo $((${LS_RELEASE_NUMBER} + 1)) + fi''', + returnStdout: true).trim() + } + } + } + /* ####################### + Package Version Tagging + ####################### */ + // Grab the current package versions in Git to determine package tag + stage("Set Package tag"){ + steps{ + script{ + env.PACKAGE_TAG = sh( + script: '''#!/bin/bash + if [ -e package_versions.txt ] ; then + cat package_versions.txt | md5sum | cut -c1-8 + else + echo none + fi''', + returnStdout: true).trim() + } + } + } + /* ######################## + External Release Tagging + ######################## */ + // If this is a github commit trigger determine the current commit at head + stage("Set ENV github_commit"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''', + returnStdout: true).trim() + } + } + } + // If this is a github commit trigger Set the external release link + stage("Set ENV commit_link"){ + steps{ + script{ + env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE + } + } + } + // Sanitize the release tag and strip illegal docker or github characters + stage("Sanitize tag"){ + steps{ + script{ + env.EXT_RELEASE_CLEAN = sh( + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', + returnStdout: true).trim() + } + } + } + // If this is a master build use live docker endpoints + stage("Set ENV live build"){ + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + } + steps { + script{ + env.IMAGE = env.DOCKERHUB_IMAGE + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + } else { + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + } + env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + } + } + } + // If this is a dev build use dev docker endpoints + stage("Set ENV dev build"){ + when { + not {branch "master"} + environment name: 'CHANGE_ID', value: '' + } + steps { + script{ + env.IMAGE = env.DEV_DOCKERHUB_IMAGE + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } else { + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } + env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' + } + } + } + // If this is a pull request build use dev docker endpoints + stage("Set ENV PR build"){ + when { + not {environment name: 'CHANGE_ID', value: ''} + } + steps { + script{ + env.IMAGE = env.PR_DOCKERHUB_IMAGE + if (env.MULTIARCH == 'true') { + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } else { + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } + env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST + env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' + } + } + } + // Use helper containers to render templated files + stage('Update-Templates') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + expression { + env.CONTAINER_NAME != null + } + } + steps { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker pull linuxserver/doc-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest + if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master + cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + cd ${TEMPDIR}/repo/${LS_REPO}/ + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files' + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + fi + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } + } + } + // Exit the build if the Templated files were just updated + stage('Template-exit') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'FILES_UPDATED', value: 'true' + expression { + env.CONTAINER_NAME != null + } + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + /* ############### + Build Container + ############### */ + // Build Docker container for push to LS Repo + stage('Build-Single') { + when { + environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + // Build MultiArch Docker containers for push to LS Repo + stage('Build-Multi') { + when { + environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + parallel { + stage('Build X86') { + steps { + sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + } + } + stage('Build ARMHF') { + agent { + label 'ARMHF' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static" + sh "chmod +x qemu-*" + sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + } + } + } + stage('Build ARM64') { + agent { + label 'ARM64' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static" + sh "chmod +x qemu-*" + sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + } + } + } + } + } + // Take the image we just built and dump package versions for comparison + stage('Update-packages') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + if [ "${MULTIARCH}" == "true" ]; then + LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} + else + LOCAL_CONTAINER=${IMAGE}:${META_TAG} + fi + if [ "${DIST_IMAGE}" == "alpine" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + apk info > packages && \ + apk info -v > versions && \ + paste -d " " packages versions > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "ubuntu" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + apt list -qq --installed > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + fi + NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) + 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 + cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ + cd ${TEMPDIR}/${LS_REPO}/ + wait + git add package_versions.txt + git commit -m 'Bot Updating Package Versions' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + echo "Package tag updated, stopping build process" + else + echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + echo "Package tag is same as previous continue with build process" + fi + rm -Rf ${TEMPDIR}''' + script{ + env.PACKAGE_UPDATED = sh( + script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } + } + } + // Exit the build if the package file was just updated + stage('PACKAGE-exit') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + // Exit the build if this is just a package check and there are no changes to push + stage('PACKAGECHECK-exit') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'PACKAGE_UPDATED', value: 'false' + environment name: 'EXIT_STATUS', value: '' + expression { + params.PACKAGE_CHECK == 'true' + } + } + steps { + script{ + env.EXIT_STATUS = 'ABORTED' + } + } + } + /* ####### + Testing + ####### */ + // Run Container tests + stage('Test') { + when { + environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + string(credentialsId: 'spaces-key', variable: 'DO_KEY'), + string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + ]) { + script{ + env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + } + sh '''#! /bin/bash + set -e + docker pull lsiodev/ci:latest + if [ "${MULTIARCH}" == "true" ]; then + docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG} + docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + fi + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -e IMAGE=\"${IMAGE}\" \ + -e DELAY_START=\"${CI_DELAY}\" \ + -e TAGS=\"${CI_TAGS}\" \ + -e META_TAG=\"${META_TAG}\" \ + -e PORT=\"${CI_PORT}\" \ + -e SSL=\"${CI_SSL}\" \ + -e BASE=\"${DIST_IMAGE}\" \ + -e SECRET_KEY=\"${DO_SECRET}\" \ + -e ACCESS_KEY=\"${DO_KEY}\" \ + -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ + -e WEB_SCREENSHOT=\"${CI_WEB}\" \ + -e WEB_AUTH=\"${CI_AUTH}\" \ + -e WEB_PATH=\"${CI_WEBPATH}\" \ + -e DO_REGION="ams3" \ + -e DO_BUCKET="lsio-ci" \ + -t lsiodev/ci:latest \ + python /ci/ci.py''' + } + } + } + /* ################## + Release Logic + ################## */ + // If this is an amd64 only image only push a single image + stage('Docker-Push-Single') { + when { + environment name: 'MULTIARCH', value: 'false' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + echo 'Logging into DockerHub' + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" + sh "docker push ${IMAGE}:latest" + sh "docker push ${IMAGE}:${META_TAG}" + } + } + } + // If this is a multi arch release push all images and define the manifest + stage('Docker-Push-Multi') { + when { + environment name: 'MULTIARCH', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + ''' + sh '''#! /bin/bash + if [ "${CI}" == "false" ]; then + docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${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-latest" + sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" + sh "docker push ${IMAGE}:amd64-${META_TAG}" + sh "docker push ${IMAGE}:arm32v6-${META_TAG}" + sh "docker push ${IMAGE}:arm64v8-${META_TAG}" + sh "docker push ${IMAGE}:amd64-latest" + sh "docker push ${IMAGE}:arm32v6-latest" + sh "docker push ${IMAGE}:arm64v8-latest" + sh "docker manifest push --purge ${IMAGE}:latest || :" + sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v6-latest ${IMAGE}:arm64v8-latest" + sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v6-latest --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --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}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" + sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${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}:latest" + sh "docker manifest push --purge ${IMAGE}:${META_TAG}" + } + } + } + // If this is a public release tag it in the LS Github + stage('Github-Tag-Push-Release') { + when { + branch "master" + expression { + env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER + } + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" + 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",\ + "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}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "target_commitish": "master",\ + "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 + 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''' + } + } + // Use helper container to sync the current README on master to the dockerhub endpoint + stage('Sync-README') { + when { + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + docker pull lsiodev/readme-sync + docker run --rm=true \ + -e DOCKERHUB_USERNAME=$DOCKERUSER \ + -e DOCKERHUB_PASSWORD=$DOCKERPASS \ + -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ + -e DOCKER_REPOSITORY=${IMAGE} \ + -e GIT_BRANCH=master \ + lsiodev/readme-sync bash -c 'node sync' ''' + } + } + } + } + /* ###################### + Send status to Discord + ###################### */ + post { + always { + script{ + if (env.EXIT_STATUS == "ABORTED"){ + sh 'echo "build aborted"' + } + else if (currentBuild.currentResult == "SUCCESS"){ + sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ + "username": "Jenkins"}' ${BUILDS_DISCORD} ''' + } + else { + sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ + "username": "Jenkins"}' ${BUILDS_DISCORD} ''' + } + } + } + } +} diff --git a/README.md b/README.md index f9b022d..c7863c2 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ linuxserver/htpcmanager ## Parameters -`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. +`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container. So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080 http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.` @@ -68,7 +68,7 @@ Smartmontools has not been included, you can safely ignore the warning error in * To monitor the logs of the container in realtime `docker logs -f htpcmanager`. -* container version number +* container version number `docker inspect -f '{{ index .Config.Labels "build_version" }}' htpcmanager` @@ -79,6 +79,7 @@ Smartmontools has not been included, you can safely ignore the warning error in ## Versions ++ **16.01.19:** Add pipeline logic and multi arch. + **17.08.18:** Rebase to alpine 3.8. + **12.12.17:** Rebase to alpine 3.7. + **20.07.17:** Internal git pull instead of at runtime. @@ -91,5 +92,3 @@ Smartmontools has not been included, you can safely ignore the warning error in + **08.08.16:** Rebase to alpine linux. + **14.01.15:** Remove hardcoded loglevel from the run command, set in webui + **19.09.15:** Initial Release. - - diff --git a/jenkins-vars.yml b/jenkins-vars.yml new file mode 100644 index 0000000..b1a977c --- /dev/null +++ b/jenkins-vars.yml @@ -0,0 +1,29 @@ +--- + +# jenkins variables +project_name: docker-htpcmanager +external_type: github_commit +release_type: stable +release_tag: latest +ls_branch: master +repo_vars: + - EXT_GIT_BRANCH = 'master2' + - EXT_USER = 'Hellowlol' + - EXT_REPO = 'HTPC-Manager' + - BUILD_VERSION_ARG = 'HTPCMANAGER_COMMIT' + - LS_USER = 'linuxserver' + - LS_REPO = 'docker-htpcmanager' + - CONTAINER_NAME = 'htpcmanager' + - DOCKERHUB_IMAGE = 'linuxserver/htpcmanager' + - DEV_DOCKERHUB_IMAGE = 'lsiodev/htpcmanager' + - PR_DOCKERHUB_IMAGE = 'lspipepr/htpcmanager' + - DIST_IMAGE = 'alpine' + - MULTIARCH='true' + - CI='true' + - CI_WEB='true' + - CI_PORT='8085' + - CI_SSL='false' + - CI_DELAY='120' + - CI_DOCKERENV='TZ=US/Pacific' + - CI_AUTH='user:password' + - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml new file mode 100644 index 0000000..715a485 --- /dev/null +++ b/readme-vars.yml @@ -0,0 +1,101 @@ +--- + +# project information +project_name: htpcmanager +full_custom_readme: | + {% raw -%} + [linuxserverurl]: https://linuxserver.io + [forumurl]: https://forum.linuxserver.io + [ircurl]: https://www.linuxserver.io/irc/ + [podcasturl]: https://www.linuxserver.io/podcast/ + [appurl]: https://github.com/Hellowlol/HTPC-Manager + [hub]: https://hub.docker.com/r/linuxserver/htpcmanager/ + + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at: + * [forum.linuxserver.io][forumurl] + * [IRC][ircurl] on freenode at `#linuxserver.io` + * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation! + + # linuxserver/htpcmanager + [![](https://images.microbadger.com/badges/version/linuxserver/htpcmanager.svg)](https://microbadger.com/images/linuxserver/htpcmanager "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/htpcmanager.svg)](https://microbadger.com/images/linuxserver/htpcmanager "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/htpcmanager.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/htpcmanager.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-htpcmanager)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-htpcmanager/) + + Htpcmanager, a front end for many htpc related applications. Hellowlol version.[Htpcmanager](https://github.com/Hellowlol/HTPC-Manager) + + [![htpcmanager](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/htpcmanager-icon.png)][appurl] + + ## Usage + + ``` + docker create --name=htpcmanager \ + -v :/config \ + -e PGID= -e PUID= \ + -e TZ= \ + -p 8085:8085 \ + linuxserver/htpcmanager + ``` + + ## Parameters + + `The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. + For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container. + So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080 + http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.` + + + * `-p 8085` - the port(s) + * `-v /config` - where htpcmanager should store its configuration files. + * `-e PGID` for GroupID - see below for explanation + * `-e PUID` for UserID - see below for explanation + * `-e TZ` for timezone information, eg Europe/London + + It is based on alpine-linux with s6 overlay, for shell access whilst the container is running do `docker exec -it htpcmanager /bin/bash`. + + + ### User / Group Identifiers + + Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™. + + In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below: + + ``` + $ id + uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) + ``` + + ## Setting up the application + + The webui is found at port 8085. + + Smartmontools has not been included, you can safely ignore the warning error in the log. + + ## Info + + * To monitor the logs of the container in realtime `docker logs -f htpcmanager`. + + * container version number + + `docker inspect -f '{{ index .Config.Labels "build_version" }}' htpcmanager` + + * image version number + + `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/manager` + + + ## Versions + + + **16.01.19:** Add pipeline logic and multi arch. + + **17.08.18:** Rebase to alpine 3.8. + + **12.12.17:** Rebase to alpine 3.7. + + **20.07.17:** Internal git pull instead of at runtime. + + **25.05.17:** Rebase to alpine 3.6. + + **07.02.17:** Rebase to alpine 3.5. + + **14.10.16:** Add version layer information. + + **26.09.16:** Add back cherrypy after removal from baseimage. + + **10.09.16:** Add layer badges to README. + + **28.08.16:** Add badges to README. + + **08.08.16:** Rebase to alpine linux. + + **14.01.15:** Remove hardcoded loglevel from the run command, set in webui + + **19.09.15:** Initial Release. + {%- endraw %} From 2cf3c6da1320ca79b608d11f9f0fc93c0baf7914 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 20 Jan 2019 01:20:30 -0800 Subject: [PATCH 2/2] reverting the versioning logic to pull the commit at build time, despite race conditions it is the cleanest way to pull a specific commit from github --- Dockerfile | 12 +----------- Dockerfile.aarch64 | 12 +----------- Dockerfile.armhf | 12 +----------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index 29f2bb8..5960548 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ FROM lsiobase/alpine.python:3.8 # set version label ARG BUILD_DATE ARG VERSION -ARG HTPCMANAGER_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" @@ -15,16 +14,7 @@ RUN \ pip install --no-cache-dir -U \ cherrypy && \ echo "**** install app ****" && \ - if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ - HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/Hellowlol/HTPC-Manager/commits/master2 \ - | jq -r '. | .sha'); \ - fi && \ - mkdir -p /app/htpcmanager && \ - cd /app/htpcmanager && \ - git init && \ - git remote add origin https://github.com/Hellowlol/HTPC-Manager.git && \ - git fetch --depth 1 origin ${HTPCMANAGER_COMMIT} && \ - git checkout FETCH_HEAD && \ + git clone --depth 1 https://github.com/Hellowlol/HTPC-Manager.git /app/htpcmanager && \ echo "**** cleanup ****" && \ rm -rf \ /root/.cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 72773ef..4745ce3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -6,7 +6,6 @@ COPY qemu-aarch64-static /usr/bin # set version label ARG BUILD_DATE ARG VERSION -ARG HTPCMANAGER_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" @@ -18,16 +17,7 @@ RUN \ pip install --no-cache-dir -U \ cherrypy && \ echo "**** install app ****" && \ - if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ - HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/Hellowlol/HTPC-Manager/commits/master2 \ - | jq -r '. | .sha'); \ - fi && \ - mkdir -p /app/htpcmanager && \ - cd /app/htpcmanager && \ - git init && \ - git remote add origin https://github.com/Hellowlol/HTPC-Manager.git && \ - git fetch --depth 1 origin ${HTPCMANAGER_COMMIT} && \ - git checkout FETCH_HEAD && \ + git clone --depth 1 https://github.com/Hellowlol/HTPC-Manager.git /app/htpcmanager && \ echo "**** cleanup ****" && \ rm -rf \ /root/.cache \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6ae349b..48a179c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -6,7 +6,6 @@ COPY qemu-arm-static /usr/bin # set version label ARG BUILD_DATE ARG VERSION -ARG HTPCMANAGER_COMMIT LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" @@ -18,16 +17,7 @@ RUN \ pip install --no-cache-dir -U \ cherrypy && \ echo "**** install app ****" && \ - if [ -z ${HTPCMANAGER_COMMIT+x} ]; then \ - HTPCMANAGER_COMMIT=$(curl -sX GET https://api.github.com/repos/Hellowlol/HTPC-Manager/commits/master2 \ - | jq -r '. | .sha'); \ - fi && \ - mkdir -p /app/htpcmanager && \ - cd /app/htpcmanager && \ - git init && \ - git remote add origin https://github.com/Hellowlol/HTPC-Manager.git && \ - git fetch --depth 1 origin ${HTPCMANAGER_COMMIT} && \ - git checkout FETCH_HEAD && \ + git clone --depth 1 https://github.com/Hellowlol/HTPC-Manager.git /app/htpcmanager && \ echo "**** cleanup ****" && \ rm -rf \ /root/.cache \