Bot Updating Package Versions

Bot Updating Templated Files
2026-04-09 04:34:53 +09:00 · 2019-05-18 00:56:06 +01:00 · 2019-05-10 09:47:32 -04:00 · 2019-05-03 19:55:04 -04:00 · 2019-04-20 00:55:55 +01:00 · 2019-04-06 00:56:41 +01:00
8 changed files with 89 additions and 74 deletions
--- a/10
+++ b/10
@@ -22,20 +22,14 @@ RUN \
 	tar && \
 echo "**** install heimdall ****" && \
 mkdir -p \
-	/var/www/localhost/heimdall && \
+	/heimdall && \
 if [ -z ${HEIMDALL_RELEASE+x} ]; then \
 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
 fi && \
 curl -o \
- /tmp/heimdall.tar.gz -L \
+ /heimdall/heimdall.tar.gz -L \
 	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-	/etc/nginx/fastcgi_params && \
 echo "**** cleanup ****" && \
 rm -rf \
 	/tmp/*
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -22,20 +22,14 @@ RUN \
 	tar && \
 echo "**** install heimdall ****" && \
 mkdir -p \
-	/var/www/localhost/heimdall && \
+	/heimdall && \
 if [ -z ${HEIMDALL_RELEASE+x} ]; then \
 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
 fi && \
 curl -o \
- /tmp/heimdall.tar.gz -L \
+ /heimdall/heimdall.tar.gz -L \
 	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-        /etc/nginx/fastcgi_params && \
 echo "**** cleanup ****" && \
 rm -rf \
 	/tmp/*
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -22,20 +22,14 @@ RUN \
 	tar && \
 echo "**** install heimdall ****" && \
 mkdir -p \
-	/var/www/localhost/heimdall && \
+	/heimdall && \
 if [ -z ${HEIMDALL_RELEASE+x} ]; then \
 	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
 fi && \
 curl -o \
- /tmp/heimdall.tar.gz -L \
+ /heimdall/heimdall.tar.gz -L \
 	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-        /etc/nginx/fastcgi_params && \
 echo "**** cleanup ****" && \
 rm -rf \
 	/tmp/*
--- a/28
+++ b/28
@@ -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: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 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' ''',
@@ -240,7 +240,7 @@ pipeline {
              fi
              mkdir -p ${TEMPDIR}/gitbook
              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [ "${BRANCH_NAME}" = "master" ] && [ ! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md ] || [ "$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" ]; then
+              if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
                cd ${TEMPDIR}/gitbook/docker-documentation/
                git add images/docker-${CONTAINER_NAME}.md
@@ -315,15 +315,13 @@ pipeline {
              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 --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
              sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
              sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
              sh '''docker rmi \
                    ${IMAGE}:arm32v7-${META_TAG} \
-                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} '''
+                    lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
            }
          }
        }
@@ -344,15 +342,13 @@ pipeline {
              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 --pull -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}"
              sh '''docker rmi \
                    ${IMAGE}:arm64v8-${META_TAG} \
-                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
+                    lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
            }
          }
        }
@@ -516,7 +512,7 @@ pipeline {
          sh "docker push ${IMAGE}:${META_TAG}"
          sh '''docker rmi \
                ${IMAGE}:${META_TAG} \
-                ${IMAGE}:latest '''
+                ${IMAGE}:latest || :'''
                
        }
      }
@@ -573,7 +569,7 @@ pipeline {
                ${IMAGE}:arm64v8-${META_TAG} \
                ${IMAGE}:arm64v8-latest \
                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
+                lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
        }
      }
    }
@@ -582,25 +578,25 @@ pipeline {
      when {
        branch "master"
        expression {
-          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
+          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-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}"
+        echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-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}'",\
+        -d '{"tag":"'${EXT_RELEASE_CLEAN}'-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}'-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}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
-              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
                     "target_commitish": "master",\
-                     "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
+                     "name": "'${EXT_RELEASE_CLEAN}'-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
--- a/README.md
+++ b/README.md
@@ -156,15 +156,6 @@ Below are the instructions for updating containers:
 * Start the new container: `docker start heimdall`
 * You can also remove the old dangling images: `docker image prune`

-### Via Taisun auto-updater (especially useful if you don't remember the original parameters)
-* Pull the latest image at its tag and replace it with the same env variables in one shot:
-  ```
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock taisun/updater \
-  --oneshot heimdall
-  ```
-* You can also remove the old dangling images: `docker image prune`
-
 ### Via Docker Compose
 * Update all images: `docker-compose pull`
  * or update a single image: `docker-compose pull heimdall`
@@ -172,8 +163,39 @@ Below are the instructions for updating containers:
  * or update a single container: `docker-compose up -d heimdall`
 * You can also remove the old dangling images: `docker image prune`

+### Via Watchtower auto-updater (especially useful if you don't remember the original parameters)
+* Pull the latest image at its tag and replace it with the same env variables in one run:
+  ```
+  docker run --rm \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  containrrr/watchtower \
+  --run-once heimdall
+  ```
+* You can also remove the old dangling images: `docker image prune`
+
+## Building locally
+
+If you want to make local modifications to these images for development purposes or just to customize the logic: 
+```
+git clone https://github.com/linuxserver/docker-heimdall.git
+cd docker-heimdall
+docker build \
+  --no-cache \
+  --pull \
+  -t linuxserver/heimdall:latest .
+```
+
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+```
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+```
+
+Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
+
 ## Versions

+* **01.04.19:** - Fix permission detect logic.
+* **26.03.19:** - Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **15.03.19:** - Clarify docker image tags in readme.
 * **22.02.19:** - Rebasing to alpine 3.9.
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,6 +1,6 @@
 alpine-baselayout-3.1.0-r3
 alpine-keys-2.1-r1
-apache2-utils-2.4.38-r2
+apache2-utils-2.4.39-r0
 apk-tools-2.10.3-r1
 apr-1.6.5-r0
 apr-util-1.6.1-r5
@@ -18,10 +18,10 @@ libc-utils-0.7.1-r0
 libcrypto1.1-1.1.1b-r1
 libcurl-7.64.0-r1
 libedit-20181209.3.1-r0
-libmagic-5.35-r0
+libmagic-5.36-r0
 libressl2.7-libcrypto-2.7.5-r0
 libressl2.7-libssl-2.7.5-r0
-libssh2-1.8.1-r0
+libssh2-1.8.2-r0
 libssl1.1-1.1.1b-r1
 libtls-standalone-2.7.4-r6
 libuuid-2.33-r0
@@ -36,34 +36,34 @@ ncurses-libs-6.1_p20190105-r0
 ncurses-terminfo-6.1_p20190105-r0
 ncurses-terminfo-base-6.1_p20190105-r0
 nghttp2-libs-1.35.1-r0
-nginx-1.14.2-r0
+nginx-1.14.2-r1
 openssl-1.1.1b-r1
 pcre-8.42-r1
 pcre2-10.32-r1
-php7-7.2.14-r0
-php7-common-7.2.14-r0
-php7-ctype-7.2.14-r0
-php7-fileinfo-7.2.14-r0
-php7-fpm-7.2.14-r0
-php7-json-7.2.14-r0
-php7-mbstring-7.2.14-r0
-php7-openssl-7.2.14-r0
-php7-pdo-7.2.14-r0
-php7-pdo_sqlite-7.2.14-r0
-php7-session-7.2.14-r0
-php7-simplexml-7.2.14-r0
-php7-tokenizer-7.2.14-r0
-php7-xml-7.2.14-r0
-php7-xmlwriter-7.2.14-r0
-php7-zip-7.2.14-r0
+php7-7.2.18-r0
+php7-common-7.2.18-r0
+php7-ctype-7.2.18-r0
+php7-fileinfo-7.2.18-r0
+php7-fpm-7.2.18-r0
+php7-json-7.2.18-r0
+php7-mbstring-7.2.18-r0
+php7-openssl-7.2.18-r0
+php7-pdo-7.2.18-r0
+php7-pdo_sqlite-7.2.18-r0
+php7-session-7.2.18-r0
+php7-simplexml-7.2.18-r0
+php7-tokenizer-7.2.18-r0
+php7-xml-7.2.18-r0
+php7-xmlwriter-7.2.18-r0
+php7-zip-7.2.18-r0
 popt-1.16-r7
 readline-7.0.003-r1
 scanelf-1.2.3-r0
-shadow-4.5-r0
+shadow-4.5-r1
 sqlite-libs-3.26.0-r3
 ssl_client-1.29.3-r10
 tar-1.32-r0
-tzdata-2018i-r0
+tzdata-2019a-r0
 xz-5.2.4-r0
 xz-libs-5.2.4-r0
 zlib-1.2.11-r1
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -49,6 +49,8 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "01.04.19:", desc: "Fix permission detect logic." }
+  - { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
  - { date: "15.03.19:", desc: "Clarify docker image tags in readme." }
  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -2,7 +2,19 @@

 # make our folders
 mkdir -p \
-	/config/www/{backgrounds,icons,avatars,SupportedApps}
+	/config/www/{backgrounds,icons,avatars,SupportedApps} \
+	/var/www/localhost/heimdall
+
+# install heimdall if necessary
+[[ -f /heimdall/heimdall.tar.gz ]] && \
+ echo "New container detected, installing Heimdall" && \
+ tar xf \
+ 	/heimdall/heimdall.tar.gz -C \
+	/var/www/localhost/heimdall --strip-components=1 && \
+ echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
+	/etc/nginx/fastcgi_params && \
+ rm -rf /heimdall && \
+ chown -R abc:abc /var/www/localhost/heimdall

 # create symlinks

@@ -23,11 +35,12 @@ done
 # copy .env if not exists
 [[ ! -f /config/www/.env ]] && \
  cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
+  echo "Creating app key. This may take a while on slower systems" && \
  php /var/www/localhost/heimdall/artisan key:generate
 # set queue driver to database
 sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env

 # permissions
+echo "Setting permissions"
 chown -R abc:abc \
-	/config \
-	/var/www/localhost/heimdall
+	/config
Author	SHA1	Message	Date
LinuxServer-CI	db958c7ec0	Bot Updating Package Versions	2019-05-18 00:56:06 +01:00
LinuxServer-CI	9830aec70e	Bot Updating Package Versions	2019-05-10 09:47:32 -04:00
LinuxServer-CI	c4c57fcaf9	Bot Updating Templated Files	2019-05-03 19:55:04 -04:00
LinuxServer-CI	0c0663a5ab	Bot Updating Package Versions	2019-04-20 00:55:55 +01:00
LinuxServer-CI	e73bef69c8	Bot Updating Package Versions	2019-04-06 00:56:41 +01:00
aptalca	cadf51061f	recursive chown /config every time	2019-04-02 01:43:02 +08:00
aptalca	723c0c7af0	fix echo message	2019-04-02 01:43:02 +08:00
aptalca	a157f54f20	fix permission logic	2019-04-02 01:43:02 +08:00
aptalca	5ad4d9489f	set app permissions only after install	2019-03-31 03:30:39 +08:00
thelamer	c3b57f9aa2	reducing sample size to 5 for chown logic as it is not recursive	2019-03-31 03:30:39 +08:00
thelamer	2ce4be8c28	adding first version of boilerplate code we can use for chowning	2019-03-31 03:30:39 +08:00
aptalca	54e59d820e	fix typo in if	2019-03-31 03:30:39 +08:00
aptalca	b0797041a2	install heimdall during container start	2019-03-31 03:30:39 +08:00
LinuxServer-CI	2552eaa416	Bot Updating Package Versions	2019-03-29 20:58:29 -04:00