Bot Updating Package Versions

adding build logic templating to repository on development

Jenkinsfile

@@ -8,18 +8,18 @@ pipeline {
   }
   // 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 = 'master'
     EXT_USER = 'linuxserver'
     EXT_REPO = 'Heimdall'
+    CONTAINER_NAME = 'heimdall'
     BUILD_VERSION_ARG = 'HEIMDALL_RELEASE'
     LS_USER = 'linuxserver'
     LS_REPO = 'docker-heimdall'
-    CONTAINER_NAME = 'heimdall'
     DOCKERHUB_IMAGE = 'linuxserver/heimdall'
     DEV_DOCKERHUB_IMAGE = 'lsiodev/heimdall'
     PR_DOCKERHUB_IMAGE = 'lspipepr/heimdall'
-    BUILDS_DISCORD = credentials('build_webhook_url')
-    GITHUB_TOKEN = credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     DIST_IMAGE = 'alpine'
     MULTIARCH='true'
     CI='true'
@@ -83,12 +83,12 @@ pipeline {
           env.PACKAGE_TAG = sh(
             script: '''#!/bin/bash
                        http_code=$(curl --write-out %{http_code} -s -o /dev/null \
-                                   https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt)
+                                   https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt)
                        if [[ "${http_code}" -ne 200 ]] ; then
                          echo none
                        else
                          curl -s \
-                           https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt \
+                           https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/development/package_versions.txt \
                          | md5sum | cut -c1-8
                        fi''',
             returnStdout: true).trim()
@@ -110,13 +110,13 @@ pipeline {
     }
     // 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
-        }
-      }
+     steps{
+       script{
+         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE
+       }
+     }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a development build use live docker endpoints
     stage("Set ENV live build"){
       when {
         branch "development"
@@ -172,10 +172,10 @@ pipeline {
         }
       }
     }
-    // Use helper container to render a readme from the template if needed
-    stage('Update-README') {
+    // Use helper containers to render templated files
+    stage('Update-Templates') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -183,34 +183,40 @@ pipeline {
       }
       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=development -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
               docker pull linuxserver/doc-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
-              if [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then
-                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/${LS_REPO}/
-                cd ${TEMPDIR}/${LS_REPO}/
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git add README.md
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating README from template'
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -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 development
+                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.README_UPDATED = sh(
+          env.FILES_UPDATED = sh(
             script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
             returnStdout: true).trim()
         }
       }
     }
-    // Exit the build if the Readme was just updated
-    stage('README-exit') {
+    // Exit the build if the Templated files were just updated
+    stage('Template-exit') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
-        environment name: 'README_UPDATED', value: 'true'
+        environment name: 'FILES_UPDATED', value: 'true'
         expression {
           env.CONTAINER_NAME != null
         }
@@ -305,12 +311,13 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "development"
         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}
@@ -328,6 +335,7 @@ pipeline {
               fi
               if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${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 development
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt
@@ -348,7 +356,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -362,7 +370,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 "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -391,6 +399,7 @@ pipeline {
           string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
         ]) {
           sh '''#! /bin/bash
+                set -e
                 docker pull lsiodev/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
                   docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}
@@ -498,7 +507,7 @@ pipeline {
         }
       }
     }
-    // If this is a public release tag it in the LS Github and push a changelog from external repo and our internal one
+    // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
         branch "development"

README.md

@@ -35,13 +35,13 @@ Why not use it as your browser start page? It even has the ability to include a
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `X86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). 
+Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list). 
 
 The architectures supported by this image are:
 
 | Architecture | Tag |
 | :----: | --- |
-| X86-64 | amd64-latest |
+| x86-64 | amd64-latest |
 | arm64 | arm64v8-latest |
 | armhf | arm32v6-latest |
 
@@ -60,15 +60,10 @@ docker create \
   -p 80:80 \
   -p 443:443 \
   -v </path/to/appdata/config>:/config \
-  --restart unless-stopped
+  --restart unless-stopped \
   linuxserver/heimdall
 ```
 
-Using tags, you can switch between the stable releases of Heimdall and the master branch. No tag is required for the latest stable release.
-Add the development tag,  if required,  to the linuxserver/heimdall line of the run/create command in the following format, linuxserver/heimdall:development
-The development tag will be the latest commit in the master branch of Heimdall.
-HOWEVER , USE THE DEVELOPMENT TAG AT YOUR OWN PERIL !!!!!!!!!
-
 
 ### docker-compose
 
@@ -143,6 +138,7 @@ This image now supports password protection through htpasswd. Run the following
 
 ## Versions
 
+* **20.11.18:** - Upgrade baseimage packages during build.
 * **04.11.18:** - Add php7-zip.
 * **31.10.18:** - Add queue service.
 * **17.10.18:** - Symlink avatars folder.

jenkins-vars.yml

@@ -0,0 +1,29 @@
+---
+
+# jenkins variables
+project_name: docker-heimdall
+external_type: github_commit
+release_type: prerelease
+release_tag: development
+ls_branch: development
+repo_vars:
+  - EXT_GIT_BRANCH = 'master'
+  - EXT_USER = 'linuxserver'
+  - EXT_REPO = 'Heimdall'
+  - CONTAINER_NAME = 'heimdall'
+  - BUILD_VERSION_ARG = 'HEIMDALL_RELEASE'
+  - LS_USER = 'linuxserver'
+  - LS_REPO = 'docker-heimdall'
+  - DOCKERHUB_IMAGE = 'linuxserver/heimdall'
+  - DEV_DOCKERHUB_IMAGE = 'lsiodev/heimdall'
+  - PR_DOCKERHUB_IMAGE = 'lspipepr/heimdall'
+  - DIST_IMAGE = 'alpine'
+  - MULTIARCH='true'
+  - CI='true'
+  - CI_WEB='true'
+  - CI_PORT='80'
+  - CI_SSL='false'
+  - CI_DELAY='120'
+  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_AUTH='user:password'
+  - CI_WEBPATH=''

package_versions.txt

@@ -32,7 +32,7 @@ apr-util apr-util-1.6.1-r2
 apache2-utils apache2-utils-2.4.35-r0
 nghttp2-libs nghttp2-libs-1.32.0-r0
 libssh2 libssh2-1.8.0-r3
-libcurl libcurl-7.61.1-r0
+libcurl libcurl-7.61.1-r1
 pcre2 pcre2-10.31-r0
 git git-2.18.1-r0
 popt popt-1.16-r7
@@ -40,10 +40,10 @@ logrotate logrotate-3.14.0-r0
 libmagic libmagic-5.32-r0
 nano nano-2.9.8-r0
 pcre pcre-8.42-r0
-nginx nginx-1.14.0-r1
-libcrypto1.0 libcrypto1.0-1.0.2p-r0
-libssl1.0 libssl1.0-1.0.2p-r0
-openssl openssl-1.0.2p-r0
+nginx nginx-1.14.1-r0
+libcrypto1.0 libcrypto1.0-1.0.2q-r0
+libssl1.0 libssl1.0-1.0.2q-r0
+openssl openssl-1.0.2q-r0
 php7-common php7-common-7.2.10-r0
 libedit libedit-20170329.3.1-r3
 libxml2 libxml2-2.9.8-r1
@@ -57,7 +57,7 @@ php7-session php7-session-7.2.10-r0
 php7-simplexml php7-simplexml-7.2.10-r0
 php7-xml php7-xml-7.2.10-r0
 php7-xmlwriter php7-xmlwriter-7.2.10-r0
-curl curl-7.61.1-r0
+curl curl-7.61.1-r1
 php7-ctype php7-ctype-7.2.10-r0
 php7-pdo php7-pdo-7.2.10-r0
 sqlite-libs sqlite-libs-3.24.0-r0