From d7f12610c6db2841e73962f177d523495f50684d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Nov 2018 15:23:50 +0000 Subject: [PATCH 001/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ce969e0..880e913 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -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 From 082195f95e56536d6f936201df0872e8374e8ef6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 10 Nov 2018 18:26:59 +0000 Subject: [PATCH 002/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 880e913..6f94173 100644 --- a/package_versions.txt +++ b/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,7 +40,7 @@ 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 +nginx nginx-1.14.1-r0 libcrypto1.0 libcrypto1.0-1.0.2p-r0 libssl1.0 libssl1.0-1.0.2p-r0 openssl openssl-1.0.2p-r0 From a87dcde2cdf686a52426541e7fa5136b0126142a Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 20 Nov 2018 12:21:17 -0500 Subject: [PATCH 003/262] upgrade baseimage packages during build --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Dockerfile.armhf | 5 +++-- readme-vars.yml | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4267c5b..3ad82e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,9 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ + apk add --no-cache --upgrade \ curl \ + nginx \ php7-ctype \ php7-pdo_sqlite \ php7-tokenizer \ @@ -23,7 +24,7 @@ RUN \ mkdir -p \ /var/www/localhost/heimdall && \ if [ -z ${HEIMDALL_RELEASE+x} ]; then \ - HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ + HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f73f611..6bec0d3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,8 +15,9 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ + apk add --no-cache --upgrade \ curl \ + nginx \ php7-ctype \ php7-pdo_sqlite \ php7-tokenizer \ @@ -26,7 +27,7 @@ RUN \ mkdir -p \ /var/www/localhost/heimdall && \ if [ -z ${HEIMDALL_RELEASE+x} ]; then \ - HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ + HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 145a813..f90c78b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -15,8 +15,9 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ echo "**** install runtime packages ****" && \ - apk add --no-cache \ + apk add --no-cache --upgrade \ curl \ + nginx \ php7-ctype \ php7-pdo_sqlite \ php7-tokenizer \ @@ -26,7 +27,7 @@ RUN \ mkdir -p \ /var/www/localhost/heimdall && \ if [ -z ${HEIMDALL_RELEASE+x} ]; then \ - HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ + HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ diff --git a/readme-vars.yml b/readme-vars.yml index 6428f23..a8e0381 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." } - { date: "04.11.18:", desc: "Add php7-zip." } - { date: "31.10.18:", desc: "Add queue service." } - { date: "17.10.18:", desc: "Symlink avatars folder." } From 6b4d8c8f85a2d00bde3de02590747f2a63a62c93 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 20 Nov 2018 13:13:17 -0500 Subject: [PATCH 004/262] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b855c6e..9d7fda4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,6 +11,7 @@ pipeline { 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' From 59fdc51086f619109d965ba3e399419965465972 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Nov 2018 18:23:08 +0000 Subject: [PATCH 005/262] Bot Updating README from template --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index c254f61..a67bb5c 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ From August 2018 onwards, Linuxserver are in the midst of switching to a new CI TLDR: Multi-arch support is changing from multiple repos to one repo per container image. # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) +[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://images.microbadger.com/badges/version/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg) @@ -59,6 +60,7 @@ docker create \ -p 80:80 \ -p 443:443 \ -v :/config \ + --restart unless-stopped linuxserver/heimdall ``` @@ -136,6 +138,8 @@ 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. * **16.10.18:** - Updated fastcgi_params for user login support. From d25b2b563e57f4b8c35392b33063533b45e324bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 27 Nov 2018 12:52:09 +0000 Subject: [PATCH 006/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6f94173..a8af00d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,9 +41,9 @@ libmagic libmagic-5.32-r0 nano nano-2.9.8-r0 pcre pcre-8.42-r0 nginx nginx-1.14.1-r0 -libcrypto1.0 libcrypto1.0-1.0.2p-r0 -libssl1.0 libssl1.0-1.0.2p-r0 -openssl openssl-1.0.2p-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 From e41f0eb794f13653b0aedddd30e657af1cfa5c3e Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 3 Dec 2018 20:24:38 -0800 Subject: [PATCH 007/262] adding build logic templating to repository on development --- Jenkinsfile | 577 ++--------------------------------------------- jenkins-vars.yml | 29 +++ 2 files changed, 49 insertions(+), 557 deletions(-) create mode 100644 jenkins-vars.yml diff --git a/Jenkinsfile b/Jenkinsfile index 9d7fda4..c40f3a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,178 +2,16 @@ 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') - } - // Configuraiton for the variables used for this specific repo + // Configuration for the variables used for this specific repo environment { - 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' - BUILDS_DISCORD = credentials('build_webhook_url') - GITHUB_TOKEN = credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') - 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='' + LS_USER='linuxserver' + LS_REPO='docker-heimdall' + CONTAINER_NAME='heimdall' + GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') } 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 - http_code=$(curl --write-out %{http_code} -s -o /dev/null \ - https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/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 \ - | md5sum | cut -c1-8 - fi''', - returnStdout: true).trim() - } - } - } - /* ######################## - External Release Tagging - ######################## */ - // If this is a stable github release use the latest endpoint from github to determine the ext tag - stage("Set ENV github_stable"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', - returnStdout: true).trim() - } - } - } - // If this is a stable or devel github release generate the link for the build message - stage("Set ENV github_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE - } - } - } - // 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 + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER - } else { - env.CI_TAGS = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER - } - env.META_TAG = env.EXT_RELEASE + '-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 + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } else { - env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } - env.META_TAG = env.EXT_RELEASE + '-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 + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - } else { - env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - } - env.META_TAG = env.EXT_RELEASE + '-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 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" environment name: 'CHANGE_ID', value: '' @@ -184,397 +22,22 @@ pipeline { steps { sh '''#! /bin/bash 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} -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 - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + 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 fi rm -Rf ${TEMPDIR}''' - script{ - env.README_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } - } - } - // Exit the build if the Readme was just updated - stage('README-exit') { - when { - branch "master" - environment name: 'CHANGE_ID', value: '' - environment name: 'README_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 - 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 -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ - apk info > packages && \ - apk info -v > versions && \ - paste -d " " packages versions > /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ - apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' - 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} - cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ - cd ${TEMPDIR}/${LS_REPO}/ - git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt - git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' - git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - 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') - ]) { - sh '''#! /bin/bash - 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''' - script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' - } - } - } - } - /* ################## - 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}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :" - 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 and push a changelog from external repo and our internal one - stage('Github-Tag-Push-Release') { - when { - branch "master" - expression { - env.LS_RELEASE != env.EXT_RELEASE + '-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}-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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE}'-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}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ - "name": "'${EXT_RELEASE}'-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/jenkins-vars.yml b/jenkins-vars.yml new file mode 100644 index 0000000..6bae949 --- /dev/null +++ b/jenkins-vars.yml @@ -0,0 +1,29 @@ +--- + +# jenkins variables +project_name: docker-heimdall +external_type: github_stable +release_type: stable +release_tag: latest +ls_branch: master +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='' From 7f8b28e490061408a8625ce34bbb9a70435b34ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Dec 2018 10:47:27 +0000 Subject: [PATCH 008/262] Bot Updating Templated Files --- Jenkinsfile | 554 +++++++++++++++++++++++++++++++++++++++++++++++++++- README.md | 6 +- 2 files changed, 553 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c40f3a7..e5bee44 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,14 +2,176 @@ 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 { - LS_USER='linuxserver' - LS_REPO='docker-heimdall' - CONTAINER_NAME='heimdall' + 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' + 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='' } 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 + http_code=$(curl --write-out %{http_code} -s -o /dev/null \ + https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/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 \ + | md5sum | cut -c1-8 + fi''', + returnStdout: true).trim() + } + } + } + /* ######################## + External Release Tagging + ######################## */ + // If this is a stable github release use the latest endpoint from github to determine the ext tag + stage("Set ENV github_stable"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', + returnStdout: true).trim() + } + } + } + // If this is a stable or devel github release generate the link for the build message + stage("Set ENV github_link"){ + steps{ + script{ + env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE + } + } + } + // 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 + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + } else { + env.CI_TAGS = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + } + env.META_TAG = env.EXT_RELEASE + '-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 + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } else { + env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + } + env.META_TAG = env.EXT_RELEASE + '-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 + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } else { + env.CI_TAGS = env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + } + env.META_TAG = env.EXT_RELEASE + '-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 { @@ -21,9 +183,10 @@ 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=master -v ${TEMPDIR}:/ansible/jenkins 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 @@ -36,8 +199,391 @@ pipeline { 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 -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + apk info > packages && \ + apk info -v > versions && \ + paste -d " " packages versions > /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "ubuntu" ]; then + docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' + 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} + cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ + cd ${TEMPDIR}/${LS_REPO}/ + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master + git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt + git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' + git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} + 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') + ]) { + 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''' + script{ + env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + } + } + } + } + /* ################## + 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}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :" + 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 + '-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}-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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "object": "'${COMMIT_SHA}'",\ + "message": "Tagging Release '${EXT_RELEASE}'-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}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "target_commitish": "master",\ + "name": "'${EXT_RELEASE}'-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 a67bb5c..b0db8ac 100644 --- a/README.md +++ b/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,7 +60,7 @@ docker create \ -p 80:80 \ -p 443:443 \ -v :/config \ - --restart unless-stopped + --restart unless-stopped \ linuxserver/heimdall ``` From 84a05313d9ebf78cb2dadb22920f972a6a1abeb4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Dec 2018 12:49:03 +0000 Subject: [PATCH 009/262] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e5bee44..4db6f57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -335,9 +335,9 @@ 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 master cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all From 90e8c4c608a16dbbf44b7e76712fb8eb763b558b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Dec 2018 12:49:12 +0000 Subject: [PATCH 010/262] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4db6f57..063c045 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -325,12 +325,12 @@ pipeline { LOCAL_CONTAINER=${IMAGE}:${META_TAG} fi if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + 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' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\ + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' fi if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then From 64a7009f83410813cbdb499478550c1cac490817 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Dec 2018 12:53:16 +0000 Subject: [PATCH 011/262] Bot Updating Package Versions --- package_versions.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a8af00d..fa96617 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,11 +1,11 @@ musl musl-1.1.19-r10 -busybox busybox-1.28.4-r1 +busybox busybox-1.28.4-r2 alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-keys alpine-keys-2.1-r1 libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 -ssl_client ssl_client-1.28.4-r1 +ssl_client ssl_client-1.28.4-r2 zlib zlib-1.2.11-r1 apk-tools apk-tools-2.10.1-r0 scanelf scanelf-1.2.3-r0 @@ -44,25 +44,25 @@ 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 +php7-common php7-common-7.2.13-r0 libedit libedit-20170329.3.1-r3 libxml2 libxml2-2.9.8-r1 -php7 php7-7.2.10-r0 -php7-fileinfo php7-fileinfo-7.2.10-r0 -php7-fpm php7-fpm-7.2.10-r0 -php7-json php7-json-7.2.10-r0 -php7-mbstring php7-mbstring-7.2.10-r0 -php7-openssl php7-openssl-7.2.10-r0 -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 +php7 php7-7.2.13-r0 +php7-fileinfo php7-fileinfo-7.2.13-r0 +php7-fpm php7-fpm-7.2.13-r0 +php7-json php7-json-7.2.13-r0 +php7-mbstring php7-mbstring-7.2.13-r0 +php7-openssl php7-openssl-7.2.13-r0 +php7-session php7-session-7.2.13-r0 +php7-simplexml php7-simplexml-7.2.13-r0 +php7-xml php7-xml-7.2.13-r0 +php7-xmlwriter php7-xmlwriter-7.2.13-r0 curl curl-7.61.1-r1 -php7-ctype php7-ctype-7.2.10-r0 -php7-pdo php7-pdo-7.2.10-r0 +php7-ctype php7-ctype-7.2.13-r0 +php7-pdo php7-pdo-7.2.13-r0 sqlite-libs sqlite-libs-3.24.0-r0 -php7-pdo_sqlite php7-pdo_sqlite-7.2.10-r0 -php7-tokenizer php7-tokenizer-7.2.10-r0 +php7-pdo_sqlite php7-pdo_sqlite-7.2.13-r0 +php7-tokenizer php7-tokenizer-7.2.13-r0 libzip libzip-1.5.1-r1 -php7-zip php7-zip-7.2.10-r0 +php7-zip php7-zip-7.2.13-r0 tar tar-1.30-r0 From 08ef032b3ca1eb54029685d9ccf7e588c7fc1511 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 22 Dec 2018 00:50:42 +0000 Subject: [PATCH 012/262] Bot Updating Templated Files --- Jenkinsfile | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 063c045..a573ba4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -116,6 +116,16 @@ pipeline { } } } + // 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 { @@ -126,11 +136,11 @@ pipeline { script{ env.IMAGE = env.DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm32v6-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + 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 + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } - env.META_TAG = env.EXT_RELEASE + '-ls' + env.LS_TAG_NUMBER + env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } } } @@ -144,11 +154,11 @@ pipeline { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + 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 + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } - env.META_TAG = env.EXT_RELEASE + '-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/' } } @@ -162,11 +172,11 @@ pipeline { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v6-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + 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 + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } - env.META_TAG = env.EXT_RELEASE + '-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/' } @@ -328,10 +338,12 @@ pipeline { 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' + 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 -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt' + apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' 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} @@ -498,7 +510,7 @@ pipeline { 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}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} || :" + 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" @@ -512,25 +524,25 @@ pipeline { when { branch "master" expression { - env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER + 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}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}" + 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}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + -d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to master",\ + "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}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ "target_commitish": "master",\ - "name": "'${EXT_RELEASE}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\ + "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 From 1d9a9b84b1e028cc1851e5962e40e069e568945c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 22 Dec 2018 00:55:21 +0000 Subject: [PATCH 013/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fa96617..be23812 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ 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.1-r0 +nginx nginx-1.14.2-r0 libcrypto1.0 libcrypto1.0-1.0.2q-r0 libssl1.0 libssl1.0-1.0.2q-r0 openssl openssl-1.0.2q-r0 From aedecabd3729271b3b2c7225dc6370a6b129da21 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Jan 2019 12:48:48 +0000 Subject: [PATCH 014/262] Bot Updating Templated Files --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a573ba4..1481014 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -410,6 +410,9 @@ pipeline { 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 @@ -438,9 +441,6 @@ pipeline { -e DO_BUCKET="lsio-ci" \ -t lsiodev/ci:latest \ python /ci/ci.py''' - script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' - } } } } From 6b7de48dbf0a0b263b41e0608c4bf3d07b0c2bb8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Jan 2019 12:52:53 +0000 Subject: [PATCH 015/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index be23812..29199f3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,11 +1,9 @@ musl musl-1.1.19-r10 -busybox busybox-1.28.4-r2 alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-keys alpine-keys-2.1-r1 libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 -ssl_client ssl_client-1.28.4-r2 zlib zlib-1.2.11-r1 apk-tools apk-tools-2.10.1-r0 scanelf scanelf-1.2.3-r0 @@ -57,10 +55,12 @@ php7-session php7-session-7.2.13-r0 php7-simplexml php7-simplexml-7.2.13-r0 php7-xml php7-xml-7.2.13-r0 php7-xmlwriter php7-xmlwriter-7.2.13-r0 +busybox busybox-1.28.4-r3 +ssl_client ssl_client-1.28.4-r3 curl curl-7.61.1-r1 php7-ctype php7-ctype-7.2.13-r0 php7-pdo php7-pdo-7.2.13-r0 -sqlite-libs sqlite-libs-3.24.0-r0 +sqlite-libs sqlite-libs-3.25.3-r0 php7-pdo_sqlite php7-pdo_sqlite-7.2.13-r0 php7-tokenizer php7-tokenizer-7.2.13-r0 libzip libzip-1.5.1-r1 From 85afafa5855fbdd4ffd76da70171ebb7c8e4bc20 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 4 Jan 2019 15:36:03 +0000 Subject: [PATCH 016/262] generate app key on new install --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 13 +++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b0db8ac..44f0229 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ This image now supports password protection through htpasswd. Run the following ## Versions +* **04.01.18:** - Generate random app key in .env for new installs. * **20.11.18:** - Upgrade baseimage packages during build. * **04.11.18:** - Add php7-zip. * **31.10.18:** - Add queue service. diff --git a/readme-vars.yml b/readme-vars.yml index a8e0381..441abe2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.01.18:", desc: "Generate random app key in .env for new installs." } - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." } - { date: "04.11.18:", desc: "Add php7-zip." } - { date: "31.10.18:", desc: "Add queue service." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 8624b9c..1b012eb 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -4,12 +4,6 @@ mkdir -p \ /config/www/{backgrounds,icons,avatars,SupportedApps} -# copy .env if not exists -[[ ! -f /config/www/.env ]] && \ - cp /var/www/localhost/heimdall/.env /config/www/.env -# set queue driver to database -sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env - # create symlinks symlinks=( \ @@ -26,6 +20,13 @@ do [[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i" done +# copy .env if not exists +[[ ! -f /config/www/.env ]] && \ + cp /var/www/localhost/heimdall/.env.example /config/www/.env && \ + 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 chown -R abc:abc \ /config \ From bcb72552cf4affbf8c447f32ac82faddd934ff70 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Jan 2019 12:49:57 +0000 Subject: [PATCH 017/262] Bot Updating Templated Files --- Jenkinsfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1481014..f103693 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -345,17 +345,22 @@ pipeline { apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' fi - if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then + 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}/ - git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt - git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions' - git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + 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{ From f3f5231a66453423da455f175c679913e34b6591 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Jan 2019 12:54:17 +0000 Subject: [PATCH 018/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 29199f3..e6095b0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,9 +1,11 @@ musl musl-1.1.19-r10 +busybox busybox-1.28.4-r3 alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-keys alpine-keys-2.1-r1 libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 +ssl_client ssl_client-1.28.4-r3 zlib zlib-1.2.11-r1 apk-tools apk-tools-2.10.1-r0 scanelf scanelf-1.2.3-r0 @@ -55,8 +57,6 @@ php7-session php7-session-7.2.13-r0 php7-simplexml php7-simplexml-7.2.13-r0 php7-xml php7-xml-7.2.13-r0 php7-xmlwriter php7-xmlwriter-7.2.13-r0 -busybox busybox-1.28.4-r3 -ssl_client ssl_client-1.28.4-r3 curl curl-7.61.1-r1 php7-ctype php7-ctype-7.2.13-r0 php7-pdo php7-pdo-7.2.13-r0 From 60ebf428bb29f11ee5cfb48399b0a337e054cf83 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Jan 2019 07:49:00 -0500 Subject: [PATCH 019/262] Bot Updating Templated Files --- Jenkinsfile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f103693..d1f9074 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -82,14 +82,10 @@ pipeline { script{ 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) - if [[ "${http_code}" -ne 200 ]] ; then - echo none + if [ -e package_versions.txt ] ; then + cat package_versions.txt | md5sum | cut -c1-8 else - curl -s \ - https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt \ - | md5sum | cut -c1-8 + echo none fi''', returnStdout: true).trim() } @@ -121,7 +117,7 @@ pipeline { steps{ script{ env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:]//g' ''', + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() } } @@ -342,7 +338,7 @@ pipeline { chmod 777 /tmp/package_versions.txt' elif [ "${DIST_IMAGE}" == "ubuntu" ]; then docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt && \ + 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 ) From ff93e822b2ebafc78fce1ae8fbac3f174b52a559 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Jan 2019 12:52:49 +0000 Subject: [PATCH 020/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e6095b0..85a4441 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ tzdata tzdata-2018f-r0 libuuid libuuid-2.32-r0 apr apr-1.6.3-r1 expat expat-2.2.5-r0 -apr-util apr-util-1.6.1-r2 +apr-util apr-util-1.6.1-r3 apache2-utils apache2-utils-2.4.35-r0 nghttp2-libs nghttp2-libs-1.32.0-r0 libssh2 libssh2-1.8.0-r3 From 273c4f86e9864027b364eb6797addc545588cff8 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 16 Jan 2019 12:31:40 -0500 Subject: [PATCH 021/262] fix changelog date --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 44f0229..515c9e9 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ This image now supports password protection through htpasswd. Run the following ## Versions -* **04.01.18:** - Generate random app key in .env for new installs. +* **16.01.18:** - Generate random app key in .env for new installs. * **20.11.18:** - Upgrade baseimage packages during build. * **04.11.18:** - Add php7-zip. * **31.10.18:** - Add queue service. diff --git a/readme-vars.yml b/readme-vars.yml index 441abe2..854a5e2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,7 +47,7 @@ app_setup_block: | # changelog changelogs: - - { date: "04.01.18:", desc: "Generate random app key in .env for new installs." } + - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." } - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." } - { date: "04.11.18:", desc: "Add php7-zip." } - { date: "31.10.18:", desc: "Add queue service." } From 0fff1e545344a2d057187167f59eeaca556aab14 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 16 Jan 2019 13:52:40 -0500 Subject: [PATCH 022/262] add development tag info --- README.md | 5 +++++ readme-vars.yml | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 515c9e9..6455c20 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,11 @@ docker create \ 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 diff --git a/readme-vars.yml b/readme-vars.yml index 854a5e2..3854efe 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -32,8 +32,13 @@ param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} # optional parameters -optional_block_1: false -optional_block_1_items: "" +optional_block_1: true +optional_block_1_items: + - | + 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 !!!!!!!!! # application setup block app_setup_block_enabled: true From 85b139e67f7c1b06c5f91e027d665b5927ad2fd5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Jan 2019 12:51:33 +0000 Subject: [PATCH 023/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 85a4441..5732c33 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -65,4 +65,4 @@ php7-pdo_sqlite php7-pdo_sqlite-7.2.13-r0 php7-tokenizer php7-tokenizer-7.2.13-r0 libzip libzip-1.5.1-r1 php7-zip php7-zip-7.2.13-r0 -tar tar-1.30-r0 +tar tar-1.31-r0 From 019d4d7a62725dacc1c3cad778056abd3c656d7b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Jan 2019 12:54:18 +0000 Subject: [PATCH 024/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5732c33..1048f9e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ libuuid libuuid-2.32-r0 apr apr-1.6.3-r1 expat expat-2.2.5-r0 apr-util apr-util-1.6.1-r3 -apache2-utils apache2-utils-2.4.35-r0 +apache2-utils apache2-utils-2.4.38-r1 nghttp2-libs nghttp2-libs-1.32.0-r0 libssh2 libssh2-1.8.0-r3 libcurl libcurl-7.61.1-r1 From 3bfdf1b5301e6164dd0acde399c9c714b4261865 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 9 Feb 2019 00:54:33 +0000 Subject: [PATCH 025/262] Bot Updating Templated Files --- Jenkinsfile | 9 +++++++++ README.md | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index d1f9074..ec1b56d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -209,6 +209,15 @@ pipeline { else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} 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 + 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 + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all + fi rm -Rf ${TEMPDIR}''' script{ env.FILES_UPDATED = sh( diff --git a/README.md b/README.md index 6455c20..bf5b760 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain [![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg) ![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg) +[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-heimdall/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) +[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. @@ -37,6 +39,8 @@ Why not use it as your browser start page? It even has the ability to include a 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). +Simply pulling `linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. + The architectures supported by this image are: | Architecture | Tag | @@ -45,6 +49,7 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v6-latest | + ## Usage Here are some example snippets to help you get started creating a container. @@ -120,6 +125,7 @@ In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as bel uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) ``` +   ## Application Setup @@ -141,6 +147,25 @@ This image now supports password protection through htpasswd. Run the following * image version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall` +## Updating Info + +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. + +Below are the instructions for updating containers: + +### Via Docker Run/Create +* Update the image: `docker pull linuxserver/heimdall` +* Stop the running container: `docker stop heimdall` +* Delete the container: `docker rm heimdall` +* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) +* Start the new container: `docker start heimdall` +* You can also remove the old dangling images: `docker image prune` + +### Via Docker Compose +* Update the image: `docker-compose pull linuxserver/heimdall` +* Let compose update containers as necessary: `docker-compose up -d` +* You can also remove the old dangling images: `docker image prune` + ## Versions * **16.01.18:** - Generate random app key in .env for new installs. From 9b7d2285b7ce7371cb254c83fe0d84456e8b89ff Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 9 Feb 2019 00:59:37 +0000 Subject: [PATCH 026/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1048f9e..35e0587 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ libuuid libuuid-2.32-r0 apr apr-1.6.3-r1 expat expat-2.2.5-r0 apr-util apr-util-1.6.1-r3 -apache2-utils apache2-utils-2.4.38-r1 +apache2-utils apache2-utils-2.4.38-r3 nghttp2-libs nghttp2-libs-1.32.0-r0 libssh2 libssh2-1.8.0-r3 libcurl libcurl-7.61.1-r1 From 04fe5275d9aa35b626b8eabca23791b67fd15786 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 22 Feb 2019 20:02:31 -0500 Subject: [PATCH 027/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 35e0587..95a2394 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,9 +2,6 @@ musl musl-1.1.19-r10 busybox busybox-1.28.4-r3 alpine-baselayout alpine-baselayout-3.1.0-r0 alpine-keys alpine-keys-2.1-r1 -libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0 -libressl2.7-libssl libressl2.7-libssl-2.7.4-r0 -libressl2.7-libtls libressl2.7-libtls-2.7.4-r0 ssl_client ssl_client-1.28.4-r3 zlib zlib-1.2.11-r1 apk-tools apk-tools-2.10.1-r0 @@ -57,6 +54,9 @@ php7-session php7-session-7.2.13-r0 php7-simplexml php7-simplexml-7.2.13-r0 php7-xml php7-xml-7.2.13-r0 php7-xmlwriter php7-xmlwriter-7.2.13-r0 +libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0 +libressl2.7-libssl libressl2.7-libssl-2.7.5-r0 +libressl2.7-libtls libressl2.7-libtls-2.7.5-r0 curl curl-7.61.1-r1 php7-ctype php7-ctype-7.2.13-r0 php7-pdo php7-pdo-7.2.13-r0 From 6c4da80342e1849f8c4ed07b2d54e0e6a52488d8 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 22 Feb 2019 17:23:36 -0800 Subject: [PATCH 028/262] Rebasing to Alpine 3.9 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ad82e6..542ba64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx:3.8 +FROM lsiobase/alpine.nginx:3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6bec0d3..590cdff 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx.arm64:3.8 +FROM lsiobase/alpine.nginx.arm64:3.9 # Add qemu to build on x86_64 systems COPY qemu-aarch64-static /usr/bin diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f90c78b..d4b7fad 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx.armhf:3.8 +FROM lsiobase/alpine.nginx.armhf:3.9 # Add qemu to build on x86_64 systems COPY qemu-arm-static /usr/bin diff --git a/readme-vars.yml b/readme-vars.yml index 3854efe..c37c721 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -52,6 +52,7 @@ app_setup_block: | # changelog changelogs: + - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." } - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." } - { date: "04.11.18:", desc: "Add php7-zip." } From ca39143c95fc43716492d18366a5b795620cbf46 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Feb 2019 00:55:11 -0500 Subject: [PATCH 029/262] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bf5b760..d6dd615 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,7 @@ Below are the instructions for updating containers: ## Versions +* **22.02.19:** - Rebasing to alpine 3.9. * **16.01.18:** - Generate random app key in .env for new installs. * **20.11.18:** - Upgrade baseimage packages during build. * **04.11.18:** - Add php7-zip. From 4f251c4f7ce7a5e670cadb8825438f669e9280bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Feb 2019 01:04:03 -0500 Subject: [PATCH 030/262] Bot Updating Package Versions --- package_versions.txt | 109 ++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 95a2394..faeb49d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,68 +1,69 @@ -musl musl-1.1.19-r10 -busybox busybox-1.28.4-r3 -alpine-baselayout alpine-baselayout-3.1.0-r0 +musl musl-1.1.20-r3 +busybox busybox-1.29.3-r10 +alpine-baselayout alpine-baselayout-3.1.0-r3 alpine-keys alpine-keys-2.1-r1 -ssl_client ssl_client-1.28.4-r3 +libcrypto1.1 libcrypto1.1-1.1.1a-r1 +libssl1.1 libssl1.1-1.1.1a-r1 +ca-certificates-cacert ca-certificates-cacert-20190108-r0 +libtls-standalone libtls-standalone-2.7.4-r6 +ssl_client ssl_client-1.29.3-r10 zlib zlib-1.2.11-r1 -apk-tools apk-tools-2.10.1-r0 +apk-tools apk-tools-2.10.3-r1 scanelf scanelf-1.2.3-r0 -musl-utils musl-utils-1.1.19-r10 +musl-utils musl-utils-1.1.20-r3 libc-utils libc-utils-0.7.1-r0 xz-libs xz-libs-5.2.4-r0 xz xz-5.2.4-r0 -ca-certificates ca-certificates-20171114-r3 -ncurses-terminfo-base ncurses-terminfo-base-6.1_p20180818-r1 -ncurses-terminfo ncurses-terminfo-6.1_p20180818-r1 -ncurses-libs ncurses-libs-6.1_p20180818-r1 -readline readline-7.0.003-r0 +ca-certificates ca-certificates-20190108-r0 +ncurses-terminfo-base ncurses-terminfo-base-6.1_p20190105-r0 +ncurses-terminfo ncurses-terminfo-6.1_p20190105-r0 +ncurses-libs ncurses-libs-6.1_p20190105-r0 +readline readline-7.0.003-r1 bash bash-4.4.19-r1 libattr libattr-2.4.47-r7 libacl libacl-2.2.52-r5 -coreutils coreutils-8.29-r2 +coreutils coreutils-8.30-r0 linux-pam linux-pam-1.3.0-r0 shadow shadow-4.5-r0 -tzdata tzdata-2018f-r0 -libuuid libuuid-2.32-r0 -apr apr-1.6.3-r1 -expat expat-2.2.5-r0 -apr-util apr-util-1.6.1-r3 -apache2-utils apache2-utils-2.4.38-r3 -nghttp2-libs nghttp2-libs-1.32.0-r0 -libssh2 libssh2-1.8.0-r3 -libcurl libcurl-7.61.1-r1 -pcre2 pcre2-10.31-r0 -git git-2.18.1-r0 +tzdata tzdata-2018i-r0 +libuuid libuuid-2.33-r0 +apr apr-1.6.5-r0 +expat expat-2.2.6-r0 +apr-util apr-util-1.6.1-r5 +apache2-utils apache2-utils-2.4.38-r2 +nghttp2-libs nghttp2-libs-1.35.1-r0 +libssh2 libssh2-1.8.0-r4 +libcurl libcurl-7.63.0-r0 +pcre2 pcre2-10.32-r1 +git git-2.20.1-r0 +libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r2 +libressl2.7-libssl libressl2.7-libssl-2.7.4-r2 popt popt-1.16-r7 -logrotate logrotate-3.14.0-r0 -libmagic libmagic-5.32-r0 -nano nano-2.9.8-r0 -pcre pcre-8.42-r0 +logrotate logrotate-3.15.0-r0 +libmagic libmagic-5.35-r0 +nano nano-3.2-r0 +pcre pcre-8.42-r1 nginx nginx-1.14.2-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.13-r0 -libedit libedit-20170329.3.1-r3 -libxml2 libxml2-2.9.8-r1 -php7 php7-7.2.13-r0 -php7-fileinfo php7-fileinfo-7.2.13-r0 -php7-fpm php7-fpm-7.2.13-r0 -php7-json php7-json-7.2.13-r0 -php7-mbstring php7-mbstring-7.2.13-r0 -php7-openssl php7-openssl-7.2.13-r0 -php7-session php7-session-7.2.13-r0 -php7-simplexml php7-simplexml-7.2.13-r0 -php7-xml php7-xml-7.2.13-r0 -php7-xmlwriter php7-xmlwriter-7.2.13-r0 -libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0 -libressl2.7-libssl libressl2.7-libssl-2.7.5-r0 -libressl2.7-libtls libressl2.7-libtls-2.7.5-r0 -curl curl-7.61.1-r1 -php7-ctype php7-ctype-7.2.13-r0 -php7-pdo php7-pdo-7.2.13-r0 -sqlite-libs sqlite-libs-3.25.3-r0 -php7-pdo_sqlite php7-pdo_sqlite-7.2.13-r0 -php7-tokenizer php7-tokenizer-7.2.13-r0 -libzip libzip-1.5.1-r1 -php7-zip php7-zip-7.2.13-r0 +openssl openssl-1.1.1a-r1 +php7-common php7-common-7.2.14-r0 +libedit libedit-20181209.3.1-r0 +libxml2 libxml2-2.9.9-r0 +php7 php7-7.2.14-r0 +php7-fileinfo php7-fileinfo-7.2.14-r0 +php7-fpm php7-fpm-7.2.14-r0 +php7-json php7-json-7.2.14-r0 +php7-mbstring php7-mbstring-7.2.14-r0 +php7-openssl php7-openssl-7.2.14-r0 +php7-session php7-session-7.2.14-r0 +php7-simplexml php7-simplexml-7.2.14-r0 +php7-xml php7-xml-7.2.14-r0 +php7-xmlwriter php7-xmlwriter-7.2.14-r0 +curl curl-7.63.0-r0 +php7-ctype php7-ctype-7.2.14-r0 +php7-pdo php7-pdo-7.2.14-r0 +sqlite-libs sqlite-libs-3.26.0-r3 +php7-pdo_sqlite php7-pdo_sqlite-7.2.14-r0 +php7-tokenizer php7-tokenizer-7.2.14-r0 +libzip libzip-1.5.1-r2 +php7-zip php7-zip-7.2.14-r0 tar tar-1.31-r0 From 3500eab73bdd59b74847e77a10c5998018666855 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 Mar 2019 19:54:49 -0500 Subject: [PATCH 031/262] Bot Updating Templated Files --- Jenkinsfile | 33 ++++++++++++++++++++++++++++++++- README.md | 40 ++++++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec1b56d..990b528 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { 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' ''', + 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' ''', returnStdout: true).trim() env.GITHUB_DATE = sh( script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', @@ -292,6 +292,9 @@ pipeline { --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}" + sh '''docker rmi \ + ${IMAGE}:arm32v6-${META_TAG} \ + lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -318,6 +321,9 @@ pipeline { --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} ''' } } } @@ -479,6 +485,10 @@ pipeline { sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" sh "docker push ${IMAGE}:latest" sh "docker push ${IMAGE}:${META_TAG}" + sh '''docker rmi \ + ${IMAGE}:${META_TAG} \ + ${IMAGE}:latest ''' + } } } @@ -526,6 +536,15 @@ pipeline { 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}" + sh '''docker rmi \ + ${IMAGE}:amd64-${META_TAG} \ + ${IMAGE}:amd64-latest \ + ${IMAGE}:arm32v6-${META_TAG} \ + ${IMAGE}:arm32v6-latest \ + ${IMAGE}:arm64v8-${META_TAG} \ + ${IMAGE}:arm64v8-latest \ + lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \ + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -586,6 +605,18 @@ pipeline { } } } + // If this is a Pull request send the CI link as a comment on it + stage('Pull Request Comment') { + when { + not {environment name: 'CHANGE_ID', value: ''} + environment name: 'CI', value: 'true' + environment name: 'EXIT_STATUS', value: '' + } + steps { + sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ + -d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' ''' + } + } } /* ###################### Send status to Discord diff --git a/README.md b/README.md index d6dd615..df1816e 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,6 @@ Find us at: * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). -# PSA: Changes are happening - -From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag. - -TLDR: Multi-arch support is changing from multiple repos to one repo per container image. - # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) [![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://images.microbadger.com/badges/version/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") @@ -37,7 +31,7 @@ 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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. @@ -59,8 +53,8 @@ Here are some example snippets to help you get started creating a container. ``` docker create \ --name=heimdall \ - -e PUID=1001 \ - -e PGID=1001 \ + -e PUID=1000 \ + -e PGID=1000 \ -e TZ=Europe/London \ -p 80:80 \ -p 443:443 \ @@ -87,15 +81,14 @@ services: image: linuxserver/heimdall container_name: heimdall environment: - - PUID=1001 - - PGID=1001 + - PUID=1000 + - PGID=1000 - TZ=Europe/London volumes: - :/config ports: - 80:80 - 443:443 - mem_limit: 4096m restart: unless-stopped ``` @@ -107,8 +100,8 @@ Container images are configured using parameters passed at runtime (such as thos | :----: | --- | | `-p 80` | http gui | | `-p 443` | https gui | -| `-e PUID=1001` | for UserID - see below for explanation | -| `-e PGID=1001` | for GroupID - see below for explanation | +| `-e PUID=1000` | for UserID - see below for explanation | +| `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London | | `-v /config` | Contains all relevant configuration files. | @@ -118,11 +111,11 @@ When using volumes (`-v` flags) permissions issues can arise between the host OS Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. -In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below: +In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: ``` $ id username - uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup) + uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) ``` @@ -161,9 +154,20 @@ 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 the image: `docker-compose pull linuxserver/heimdall` -* Let compose update containers as necessary: `docker-compose up -d` +* Update all images: `docker-compose pull` + * or update a single image: `docker-compose pull heimdall` +* Let compose update all containers as necessary: `docker-compose up -d` + * or update a single container: `docker-compose up -d heimdall` * You can also remove the old dangling images: `docker image prune` ## Versions From 0c4526f0f84d782a7b183b008e22c8b448380c09 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 2 Mar 2019 01:00:33 +0000 Subject: [PATCH 032/262] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index faeb49d..e6b2a3f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -33,11 +33,11 @@ apr-util apr-util-1.6.1-r5 apache2-utils apache2-utils-2.4.38-r2 nghttp2-libs nghttp2-libs-1.35.1-r0 libssh2 libssh2-1.8.0-r4 -libcurl libcurl-7.63.0-r0 +libcurl libcurl-7.64.0-r1 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 -libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r2 -libressl2.7-libssl libressl2.7-libssl-2.7.4-r2 +libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0 +libressl2.7-libssl libressl2.7-libssl-2.7.5-r0 popt popt-1.16-r7 logrotate logrotate-3.15.0-r0 libmagic libmagic-5.35-r0 @@ -47,7 +47,7 @@ nginx nginx-1.14.2-r0 openssl openssl-1.1.1a-r1 php7-common php7-common-7.2.14-r0 libedit libedit-20181209.3.1-r0 -libxml2 libxml2-2.9.9-r0 +libxml2 libxml2-2.9.9-r1 php7 php7-7.2.14-r0 php7-fileinfo php7-fileinfo-7.2.14-r0 php7-fpm php7-fpm-7.2.14-r0 @@ -58,7 +58,7 @@ php7-session php7-session-7.2.14-r0 php7-simplexml php7-simplexml-7.2.14-r0 php7-xml php7-xml-7.2.14-r0 php7-xmlwriter php7-xmlwriter-7.2.14-r0 -curl curl-7.63.0-r0 +curl curl-7.64.0-r1 php7-ctype php7-ctype-7.2.14-r0 php7-pdo php7-pdo-7.2.14-r0 sqlite-libs sqlite-libs-3.26.0-r3 @@ -66,4 +66,4 @@ php7-pdo_sqlite php7-pdo_sqlite-7.2.14-r0 php7-tokenizer php7-tokenizer-7.2.14-r0 libzip libzip-1.5.1-r2 php7-zip php7-zip-7.2.14-r0 -tar tar-1.31-r0 +tar tar-1.32-r0 From 836e553c12a96b47ad271fe72d5eb6014189e1fd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 9 Mar 2019 00:54:30 +0000 Subject: [PATCH 033/262] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 990b528..865854d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -353,7 +353,7 @@ pipeline { 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 && \ + apt list -qq --installed | cut -d" " -f1-2 > /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' fi NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) From 2994d28230b9c1381ba5d712c83b9dbfc41714ae Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 15 Mar 2019 17:55:30 -0400 Subject: [PATCH 034/262] clarify docker image tags --- README.md | 14 +++++++++----- readme-vars.yml | 16 +++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index df1816e..4f7fa1a 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,14 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v6-latest | +## Version Tags + +This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Stable Heimdall releases. | +| development | Latest commit from the github master branch. | ## Usage @@ -63,11 +71,6 @@ docker create \ 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 @@ -172,6 +175,7 @@ Below are the instructions for updating containers: ## Versions +* **15.03.19:** - Clarify docker image tags in readme. * **22.02.19:** - Rebasing to alpine 3.9. * **16.01.18:** - Generate random app key in .env for new installs. * **20.11.18:** - Upgrade baseimage packages during build. diff --git a/readme-vars.yml b/readme-vars.yml index c37c721..29f5284 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -17,6 +17,12 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"} +# development version +development_versions: true +development_versions_items: + - { tag: "latest", desc: "Stable Heimdall releases." } + - { tag: "development", desc: "Latest commit from the github master branch." } + # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" @@ -31,15 +37,6 @@ param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} -# optional parameters -optional_block_1: true -optional_block_1_items: - - | - 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 !!!!!!!!! - # application setup block app_setup_block_enabled: true app_setup_block: | @@ -52,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "15.03.19:", desc: "Clarify docker image tags in readme." } - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." } - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." } From 9fb66573e776204904da67a7e86d2c5b72f462d5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 Mar 2019 18:21:11 -0400 Subject: [PATCH 035/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e6b2a3f..bbd793a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,8 +2,6 @@ musl musl-1.1.20-r3 busybox busybox-1.29.3-r10 alpine-baselayout alpine-baselayout-3.1.0-r3 alpine-keys alpine-keys-2.1-r1 -libcrypto1.1 libcrypto1.1-1.1.1a-r1 -libssl1.1 libssl1.1-1.1.1a-r1 ca-certificates-cacert ca-certificates-cacert-20190108-r0 libtls-standalone libtls-standalone-2.7.4-r6 ssl_client ssl_client-1.29.3-r10 @@ -58,6 +56,8 @@ php7-session php7-session-7.2.14-r0 php7-simplexml php7-simplexml-7.2.14-r0 php7-xml php7-xml-7.2.14-r0 php7-xmlwriter php7-xmlwriter-7.2.14-r0 +libcrypto1.1 libcrypto1.1-1.1.1b-r1 +libssl1.1 libssl1.1-1.1.1b-r1 curl curl-7.64.0-r1 php7-ctype php7-ctype-7.2.14-r0 php7-pdo php7-pdo-7.2.14-r0 From 8f8288a46f6224f20610fe678df770606e7e8d66 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 22 Mar 2019 20:58:08 -0400 Subject: [PATCH 036/262] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bbd793a..7f26fd0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,6 +2,8 @@ musl musl-1.1.20-r3 busybox busybox-1.29.3-r10 alpine-baselayout alpine-baselayout-3.1.0-r3 alpine-keys alpine-keys-2.1-r1 +libcrypto1.1 libcrypto1.1-1.1.1b-r1 +libssl1.1 libssl1.1-1.1.1b-r1 ca-certificates-cacert ca-certificates-cacert-20190108-r0 libtls-standalone libtls-standalone-2.7.4-r6 ssl_client ssl_client-1.29.3-r10 @@ -30,7 +32,6 @@ expat expat-2.2.6-r0 apr-util apr-util-1.6.1-r5 apache2-utils apache2-utils-2.4.38-r2 nghttp2-libs nghttp2-libs-1.35.1-r0 -libssh2 libssh2-1.8.0-r4 libcurl libcurl-7.64.0-r1 pcre2 pcre2-10.32-r1 git git-2.20.1-r0 @@ -42,7 +43,7 @@ libmagic libmagic-5.35-r0 nano nano-3.2-r0 pcre pcre-8.42-r1 nginx nginx-1.14.2-r0 -openssl openssl-1.1.1a-r1 +openssl openssl-1.1.1b-r1 php7-common php7-common-7.2.14-r0 libedit libedit-20181209.3.1-r0 libxml2 libxml2-2.9.9-r1 @@ -56,8 +57,7 @@ php7-session php7-session-7.2.14-r0 php7-simplexml php7-simplexml-7.2.14-r0 php7-xml php7-xml-7.2.14-r0 php7-xmlwriter php7-xmlwriter-7.2.14-r0 -libcrypto1.1 libcrypto1.1-1.1.1b-r1 -libssl1.1 libssl1.1-1.1.1b-r1 +libssh2 libssh2-1.8.1-r0 curl curl-7.64.0-r1 php7-ctype php7-ctype-7.2.14-r0 php7-pdo php7-pdo-7.2.14-r0 From c69e0361ee64982432cdfb2a889df7e63fbba6b4 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Mar 2019 16:28:25 -0700 Subject: [PATCH 037/262] Switching to new Base images, shift to arm32v7 tag. --- Dockerfile | 2 +- Dockerfile.aarch64 | 5 +-- Dockerfile.armhf | 5 +-- Jenkinsfile | 93 ++++++++++++++++++++++++++++++---------------- README.md | 4 +- readme-vars.yml | 3 +- 6 files changed, 68 insertions(+), 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index 542ba64..da98dc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.nginx:3.9 +FROM lsiobase/nginx:3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 590cdff..48acce2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,7 +1,4 @@ -FROM lsiobase/alpine.nginx.arm64:3.9 - -# Add qemu to build on x86_64 systems -COPY qemu-aarch64-static /usr/bin +FROM lsiobase/nginx:arm64v8-3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d4b7fad..d6fc681 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,7 +1,4 @@ -FROM lsiobase/alpine.nginx.armhf:3.9 - -# Add qemu to build on x86_64 systems -COPY qemu-arm-static /usr/bin +FROM lsiobase/nginx:arm32v7-3.9 # set version label ARG BUILD_DATE diff --git a/Jenkinsfile b/Jenkinsfile index 865854d..0332ab8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -132,7 +132,7 @@ pipeline { 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 + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + 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 } @@ -150,7 +150,7 @@ pipeline { 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 + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + 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 } @@ -168,7 +168,7 @@ pipeline { 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 + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + 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 } @@ -178,6 +178,35 @@ pipeline { } } } + // Run ShellCheck + stage('ShellCheck') { + when { + environment name: 'CI', value: 'true' + } + steps { + withCredentials([ + string(credentialsId: 'spaces-key', variable: 'DO_KEY'), + string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + ]) { + script{ + env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' + } + sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' + sh '''#! /bin/bash + set -e + docker pull lsiodev/spaces-file-upload:latest + docker run --rm \ + -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ + -e FILE_NAME="shellcheck-result.xml" \ + -e MIMETYPE="text/xml" \ + -v ${WORKSPACE}:/mnt \ + -e SECRET_KEY=\"${DO_SECRET}\" \ + -e ACCESS_KEY=\"${DO_KEY}\" \ + -t lsiodev/spaces-file-upload:latest \ + python /upload.py''' + } + } + } // Use helper containers to render templated files stage('Update-Templates') { when { @@ -252,7 +281,7 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \ + sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -265,7 +294,7 @@ pipeline { parallel { stage('Build X86') { steps { - sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \ + sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -288,13 +317,13 @@ pipeline { ''' 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} \ + 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}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" - sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}" + 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}:arm32v6-${META_TAG} \ - lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ''' + ${IMAGE}:arm32v7-${META_TAG} \ + lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } } @@ -317,7 +346,7 @@ pipeline { ''' 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} \ + 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}" @@ -347,13 +376,13 @@ pipeline { 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 && \ + apk info -v > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /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 | cut -d" " -f1-2 > /tmp/package_versions.txt && \ + apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' fi NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) @@ -433,9 +462,9 @@ pipeline { set -e docker pull lsiodev/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm32v7-${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:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -512,38 +541,38 @@ pipeline { ''' sh '''#! /bin/bash if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm32v7-${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: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-latest" - sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-latest" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-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}:arm32v7-${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}:arm32v7-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 create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest" + sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-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 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}:latest" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:amd64-${META_TAG} \ ${IMAGE}:amd64-latest \ - ${IMAGE}:arm32v6-${META_TAG} \ - ${IMAGE}:arm32v6-latest \ + ${IMAGE}:arm32v7-${META_TAG} \ + ${IMAGE}:arm32v7-latest \ ${IMAGE}:arm64v8-${META_TAG} \ ${IMAGE}:arm64v8-latest \ - lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \ + lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ''' } } @@ -614,7 +643,7 @@ pipeline { } steps { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ - -d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' ''' + -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' } } } @@ -629,12 +658,12 @@ pipeline { } 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"}],\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_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"}],\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_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 4f7fa1a..22edd11 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! -* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) [![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) @@ -41,7 +40,7 @@ The architectures supported by this image are: | :----: | --- | | x86-64 | amd64-latest | | arm64 | arm64v8-latest | -| armhf | arm32v6-latest | +| armhf | arm32v7-latest | ## Version Tags @@ -175,6 +174,7 @@ Below are the instructions for updating containers: ## Versions +* **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. * **16.01.18:** - Generate random app key in .env for new installs. diff --git a/readme-vars.yml b/readme-vars.yml index 29f5284..1234310 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -15,7 +15,7 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_ available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"} + - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # development version development_versions: true @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { 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." } - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." } From 5e011ac2da2c49024eefb1aece4bc988f1bba2c1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Mar 2019 20:42:15 +0100 Subject: [PATCH 038/262] Bot Updating Package Versions --- package_versions.txt | 138 +++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7f26fd0..70f118c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,69 +1,69 @@ -musl musl-1.1.20-r3 -busybox busybox-1.29.3-r10 -alpine-baselayout alpine-baselayout-3.1.0-r3 -alpine-keys alpine-keys-2.1-r1 -libcrypto1.1 libcrypto1.1-1.1.1b-r1 -libssl1.1 libssl1.1-1.1.1b-r1 -ca-certificates-cacert ca-certificates-cacert-20190108-r0 -libtls-standalone libtls-standalone-2.7.4-r6 -ssl_client ssl_client-1.29.3-r10 -zlib zlib-1.2.11-r1 -apk-tools apk-tools-2.10.3-r1 -scanelf scanelf-1.2.3-r0 -musl-utils musl-utils-1.1.20-r3 -libc-utils libc-utils-0.7.1-r0 -xz-libs xz-libs-5.2.4-r0 -xz xz-5.2.4-r0 -ca-certificates ca-certificates-20190108-r0 -ncurses-terminfo-base ncurses-terminfo-base-6.1_p20190105-r0 -ncurses-terminfo ncurses-terminfo-6.1_p20190105-r0 -ncurses-libs ncurses-libs-6.1_p20190105-r0 -readline readline-7.0.003-r1 -bash bash-4.4.19-r1 -libattr libattr-2.4.47-r7 -libacl libacl-2.2.52-r5 -coreutils coreutils-8.30-r0 -linux-pam linux-pam-1.3.0-r0 -shadow shadow-4.5-r0 -tzdata tzdata-2018i-r0 -libuuid libuuid-2.33-r0 -apr apr-1.6.5-r0 -expat expat-2.2.6-r0 -apr-util apr-util-1.6.1-r5 -apache2-utils apache2-utils-2.4.38-r2 -nghttp2-libs nghttp2-libs-1.35.1-r0 -libcurl libcurl-7.64.0-r1 -pcre2 pcre2-10.32-r1 -git git-2.20.1-r0 -libressl2.7-libcrypto libressl2.7-libcrypto-2.7.5-r0 -libressl2.7-libssl libressl2.7-libssl-2.7.5-r0 -popt popt-1.16-r7 -logrotate logrotate-3.15.0-r0 -libmagic libmagic-5.35-r0 -nano nano-3.2-r0 -pcre pcre-8.42-r1 -nginx nginx-1.14.2-r0 -openssl openssl-1.1.1b-r1 -php7-common php7-common-7.2.14-r0 -libedit libedit-20181209.3.1-r0 -libxml2 libxml2-2.9.9-r1 -php7 php7-7.2.14-r0 -php7-fileinfo php7-fileinfo-7.2.14-r0 -php7-fpm php7-fpm-7.2.14-r0 -php7-json php7-json-7.2.14-r0 -php7-mbstring php7-mbstring-7.2.14-r0 -php7-openssl php7-openssl-7.2.14-r0 -php7-session php7-session-7.2.14-r0 -php7-simplexml php7-simplexml-7.2.14-r0 -php7-xml php7-xml-7.2.14-r0 -php7-xmlwriter php7-xmlwriter-7.2.14-r0 -libssh2 libssh2-1.8.1-r0 -curl curl-7.64.0-r1 -php7-ctype php7-ctype-7.2.14-r0 -php7-pdo php7-pdo-7.2.14-r0 -sqlite-libs sqlite-libs-3.26.0-r3 -php7-pdo_sqlite php7-pdo_sqlite-7.2.14-r0 -php7-tokenizer php7-tokenizer-7.2.14-r0 -libzip libzip-1.5.1-r2 -php7-zip php7-zip-7.2.14-r0 -tar tar-1.32-r0 +alpine-baselayout-3.1.0-r3 +alpine-keys-2.1-r1 +apache2-utils-2.4.38-r2 +apk-tools-2.10.3-r1 +apr-1.6.5-r0 +apr-util-1.6.1-r5 +bash-4.4.19-r1 +busybox-1.29.3-r10 +ca-certificates-20190108-r0 +ca-certificates-cacert-20190108-r0 +coreutils-8.30-r0 +curl-7.64.0-r1 +expat-2.2.6-r0 +git-2.20.1-r0 +libacl-2.2.52-r5 +libattr-2.4.47-r7 +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 +libressl2.7-libcrypto-2.7.5-r0 +libressl2.7-libssl-2.7.5-r0 +libssh2-1.8.1-r0 +libssl1.1-1.1.1b-r1 +libtls-standalone-2.7.4-r6 +libuuid-2.33-r0 +libxml2-2.9.9-r1 +libzip-1.5.1-r2 +linux-pam-1.3.0-r0 +logrotate-3.15.0-r0 +musl-1.1.20-r4 +musl-utils-1.1.20-r4 +nano-3.2-r0 +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 +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 +popt-1.16-r7 +readline-7.0.003-r1 +scanelf-1.2.3-r0 +shadow-4.5-r0 +sqlite-libs-3.26.0-r3 +ssl_client-1.29.3-r10 +tar-1.32-r0 +tzdata-2018i-r0 +xz-5.2.4-r0 +xz-libs-5.2.4-r0 +zlib-1.2.11-r1 From 2552eaa416cdb3f0c0acb2c66023a3f532ac8654 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 29 Mar 2019 20:58:29 -0400 Subject: [PATCH 039/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 70f118c..007aeb1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ libedit-20181209.3.1-r0 libmagic-5.35-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 From b0797041a2568b369ba6e3811617ee3c1c870b69 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 26 Mar 2019 13:44:53 -0400 Subject: [PATCH 040/262] install heimdall during container start --- Dockerfile | 10 ++-------- Dockerfile.aarch64 | 10 ++-------- Dockerfile.armhf | 10 ++-------- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 15 ++++++++++++++- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index da98dc7..07436a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 48acce2..70e959f 100644 --- 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/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d6fc681..d254e9f 100644 --- 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/* diff --git a/README.md b/README.md index 22edd11..608fff5 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,7 @@ Below are the instructions for updating containers: ## Versions +* **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. diff --git a/readme-vars.yml b/readme-vars.yml index 1234310..1f8483a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { 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." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 1b012eb..de91aa6 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -2,7 +2,18 @@ # 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 # create symlinks @@ -23,11 +34,13 @@ 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 From 54e59d820e3afc50af1f5fbb194048035d069896 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 26 Mar 2019 13:48:12 -0400 Subject: [PATCH 041/262] fix typo in if --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index de91aa6..5ec1509 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -34,7 +34,7 @@ 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" + 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 From 2ce4be8c285d64ef73bc2455875dbe739476fce6 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 26 Mar 2019 11:58:04 -0700 Subject: [PATCH 042/262] adding first version of boilerplate code we can use for chowning --- root/etc/cont-init.d/50-config | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 5ec1509..27433ad 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -39,8 +39,28 @@ done # set queue driver to database sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env +# function to randomly sample 50 files for their owner and only chown if not abc +chowner () { +files=(${1}/*) +for i in {1..50}; do + user=$(stat -c '%U' $(printf "%s\n" "${files[RANDOM % ${#files[@]}]}")) + if [ "${user}" != "abc" ]; then + chown -R abc:abc ${1} + break + fi +done +} + # permissions echo "Setting permissions" -chown -R abc:abc \ - /config \ - /var/www/localhost/heimdall +abc_dirs=( \ +/config \ +/var/www/localhost/heimdall \ +) +for i in "${abc_dirs[@]}"; do + if [ "$(ls -A ${i})" ]; then + chowner ${i} + else + chown -R abc:abc ${i} + fi +done From c3b57f9aa2b85463bb7dcf3d4f33d2ed3b41a8c8 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 28 Mar 2019 08:11:03 -0700 Subject: [PATCH 043/262] reducing sample size to 5 for chown logic as it is not recursive --- root/etc/cont-init.d/50-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 27433ad..41a07c2 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -39,10 +39,10 @@ done # set queue driver to database sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env -# function to randomly sample 50 files for their owner and only chown if not abc +# function to randomly sample 5 files for their owner and only chown if not abc chowner () { files=(${1}/*) -for i in {1..50}; do +for i in {1..5}; do user=$(stat -c '%U' $(printf "%s\n" "${files[RANDOM % ${#files[@]}]}")) if [ "${user}" != "abc" ]; then chown -R abc:abc ${1} From 5ad4d9489fe6177b687ee0ec9a71a7f247f7f318 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 28 Mar 2019 16:33:35 -0400 Subject: [PATCH 044/262] set app permissions only after install --- root/etc/cont-init.d/50-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 41a07c2..014b1b5 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -13,7 +13,8 @@ mkdir -p \ /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 + rm -rf /heimdall && \ + chown -R abc:abc /var/www/localhost/heimdall # create symlinks @@ -55,7 +56,6 @@ done echo "Setting permissions" abc_dirs=( \ /config \ -/var/www/localhost/heimdall \ ) for i in "${abc_dirs[@]}"; do if [ "$(ls -A ${i})" ]; then From a157f54f20721bc13256c70a432451838baca230 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 1 Apr 2019 10:44:33 -0400 Subject: [PATCH 045/262] fix permission logic --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 608fff5..07fe9af 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,7 @@ Below are the instructions for updating containers: ## 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. diff --git a/readme-vars.yml b/readme-vars.yml index 1f8483a..dd94a1a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ 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." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 014b1b5..09cab68 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -42,10 +42,11 @@ sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env # function to randomly sample 5 files for their owner and only chown if not abc chowner () { -files=(${1}/*) -for i in {1..5}; do +files=(${1}/**) +for i in {1..50}; do user=$(stat -c '%U' $(printf "%s\n" "${files[RANDOM % ${#files[@]}]}")) if [ "${user}" != "abc" ]; then + echo "chowning /config" chown -R abc:abc ${1} break fi @@ -54,6 +55,7 @@ done # permissions echo "Setting permissions" +shopt -s globstar abc_dirs=( \ /config \ ) From 723c0c7af09ec1b14f1248e961eb7ab53e1135be Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 1 Apr 2019 11:02:57 -0400 Subject: [PATCH 046/262] fix echo message --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 09cab68..282a581 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -46,7 +46,7 @@ files=(${1}/**) for i in {1..50}; do user=$(stat -c '%U' $(printf "%s\n" "${files[RANDOM % ${#files[@]}]}")) if [ "${user}" != "abc" ]; then - echo "chowning /config" + echo "chowning ${1}" chown -R abc:abc ${1} break fi From cadf51061f49bf0306dced30d72fc2cf83f493b2 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 1 Apr 2019 13:40:36 -0400 Subject: [PATCH 047/262] recursive chown /config every time --- root/etc/cont-init.d/50-config | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 282a581..f15596d 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -40,29 +40,7 @@ done # set queue driver to database sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env -# function to randomly sample 5 files for their owner and only chown if not abc -chowner () { -files=(${1}/**) -for i in {1..50}; do - user=$(stat -c '%U' $(printf "%s\n" "${files[RANDOM % ${#files[@]}]}")) - if [ "${user}" != "abc" ]; then - echo "chowning ${1}" - chown -R abc:abc ${1} - break - fi -done -} - # permissions echo "Setting permissions" -shopt -s globstar -abc_dirs=( \ -/config \ -) -for i in "${abc_dirs[@]}"; do - if [ "$(ls -A ${i})" ]; then - chowner ${i} - else - chown -R abc:abc ${i} - fi -done +chown -R abc:abc \ + /config From e73bef69c8498a2d08bb574bb2131bf80d550040 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 6 Apr 2019 00:56:41 +0100 Subject: [PATCH 048/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 007aeb1..3b713f6 100644 --- 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 From 0c0663a5ab37abe9f5d88b4927b9539611239a61 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 20 Apr 2019 00:55:55 +0100 Subject: [PATCH 049/262] Bot Updating Package Versions --- package_versions.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3b713f6..72e8f9e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,22 +40,22 @@ nginx-1.14.2-r0 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.17-r0 +php7-common-7.2.17-r0 +php7-ctype-7.2.17-r0 +php7-fileinfo-7.2.17-r0 +php7-fpm-7.2.17-r0 +php7-json-7.2.17-r0 +php7-mbstring-7.2.17-r0 +php7-openssl-7.2.17-r0 +php7-pdo-7.2.17-r0 +php7-pdo_sqlite-7.2.17-r0 +php7-session-7.2.17-r0 +php7-simplexml-7.2.17-r0 +php7-tokenizer-7.2.17-r0 +php7-xml-7.2.17-r0 +php7-xmlwriter-7.2.17-r0 +php7-zip-7.2.17-r0 popt-1.16-r7 readline-7.0.003-r1 scanelf-1.2.3-r0 @@ -63,7 +63,7 @@ shadow-4.5-r0 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 From c4c57fcaf9fa30f240ad6aefafaab273d022a783 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 3 May 2019 19:55:04 -0400 Subject: [PATCH 050/262] Bot Updating Templated Files --- Jenkinsfile | 28 ++++++++++++---------------- README.md | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0332ab8..ffeb55e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 diff --git a/README.md b/README.md index 07fe9af..482a79d 100644 --- 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,6 +163,35 @@ 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. From 9830aec70e8c763746c5798ef23afe11c52a8c6d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 May 2019 09:47:32 -0400 Subject: [PATCH 051/262] Bot Updating Package Versions --- package_versions.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 72e8f9e..11d0fd6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ 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.2-r0 @@ -36,26 +36,26 @@ 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.17-r0 -php7-common-7.2.17-r0 -php7-ctype-7.2.17-r0 -php7-fileinfo-7.2.17-r0 -php7-fpm-7.2.17-r0 -php7-json-7.2.17-r0 -php7-mbstring-7.2.17-r0 -php7-openssl-7.2.17-r0 -php7-pdo-7.2.17-r0 -php7-pdo_sqlite-7.2.17-r0 -php7-session-7.2.17-r0 -php7-simplexml-7.2.17-r0 -php7-tokenizer-7.2.17-r0 -php7-xml-7.2.17-r0 -php7-xmlwriter-7.2.17-r0 -php7-zip-7.2.17-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 From db958c7ec093440ffba869978106778d5346f1bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 May 2019 00:56:06 +0100 Subject: [PATCH 052/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 11d0fd6..2d1729c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -59,7 +59,7 @@ 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 From 892bcf2e72665f7267fc462d9b86746244f6a2d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 25 May 2019 00:54:49 +0100 Subject: [PATCH 053/262] Bot Updating Templated Files --- Jenkinsfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ffeb55e..7916ae1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,6 +52,14 @@ pipeline { 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 + env.LICENSE_TAG = sh( + script: '''#!/bin/bash + if [ -e LICENSE ] ; then + cat LICENSE | md5sum | cut -c1-8 + else + echo none + fi''', + returnStdout: true).trim() } script{ env.LS_RELEASE_NUMBER = sh( @@ -224,14 +232,17 @@ pipeline { 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 + 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 }')" ] || \ + [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; 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}/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${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 add Jenkinsfile README.md LICENSE 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} From 9932c9fdbac89b2adee4e3a00f9dc4e18a5fefa2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 24 May 2019 19:55:48 -0400 Subject: [PATCH 054/262] Bot Updating Templated Files --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100755 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 99cd0e8d5a3abd50e0b80a828392170ac797bf20 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 8 Jun 2019 00:54:52 +0100 Subject: [PATCH 055/262] Bot Updating Templated Files --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7916ae1..84fbe6a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -475,6 +475,7 @@ pipeline { docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ + --shm-size=1gb \ -v /var/run/docker.sock:/var/run/docker.sock \ -e IMAGE=\"${IMAGE}\" \ -e DELAY_START=\"${CI_DELAY}\" \ From 9cd399f9887b179bee799730d503c0d31f3d06eb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Jun 2019 23:56:31 +0000 Subject: [PATCH 056/262] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2d1729c..ddcaa74 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,14 +9,14 @@ busybox-1.29.3-r10 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.30-r0 -curl-7.64.0-r1 +curl-7.64.0-r2 expat-2.2.6-r0 git-2.20.1-r0 libacl-2.2.52-r5 libattr-2.4.47-r7 libc-utils-0.7.1-r0 libcrypto1.1-1.1.1b-r1 -libcurl-7.64.0-r1 +libcurl-7.64.0-r2 libedit-20181209.3.1-r0 libmagic-5.36-r0 libressl2.7-libcrypto-2.7.5-r0 @@ -59,8 +59,8 @@ php7-zip-7.2.18-r0 popt-1.16-r7 readline-7.0.003-r1 scanelf-1.2.3-r0 -shadow-4.5-r1 -sqlite-libs-3.26.0-r3 +shadow-4.5-r2 +sqlite-libs-3.28.0-r0 ssl_client-1.29.3-r10 tar-1.32-r0 tzdata-2019a-r0 From 0cd9f4da50458e57d865c5023ab21cb223445890 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 15 Jun 2019 00:57:40 +0100 Subject: [PATCH 057/262] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ddcaa74..729d4a2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,21 +41,21 @@ openssl-1.1.1b-r1 pcre-8.42-r1 pcre2-10.32-r1 php7-7.2.18-r0 -php7-common-7.2.18-r0 -php7-ctype-7.2.18-r0 +php7-common-7.2.19-r0 +php7-ctype-7.2.19-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-pdo-7.2.19-r0 +php7-pdo_sqlite-7.2.19-r0 php7-session-7.2.18-r0 php7-simplexml-7.2.18-r0 -php7-tokenizer-7.2.18-r0 +php7-tokenizer-7.2.19-r0 php7-xml-7.2.18-r0 php7-xmlwriter-7.2.18-r0 -php7-zip-7.2.18-r0 +php7-zip-7.2.19-r0 popt-1.16-r7 readline-7.0.003-r1 scanelf-1.2.3-r0 From 45d80c22170e46822c149f86a8d703697fbe79e0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 19 Jun 2019 10:54:08 +0000 Subject: [PATCH 058/262] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 729d4a2..4e69b46 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,21 +40,21 @@ nginx-1.14.2-r1 openssl-1.1.1b-r1 pcre-8.42-r1 pcre2-10.32-r1 -php7-7.2.18-r0 +php7-7.2.19-r0 php7-common-7.2.19-r0 php7-ctype-7.2.19-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-fileinfo-7.2.19-r0 +php7-fpm-7.2.19-r0 +php7-json-7.2.19-r0 +php7-mbstring-7.2.19-r0 +php7-openssl-7.2.19-r0 php7-pdo-7.2.19-r0 php7-pdo_sqlite-7.2.19-r0 -php7-session-7.2.18-r0 -php7-simplexml-7.2.18-r0 +php7-session-7.2.19-r0 +php7-simplexml-7.2.19-r0 php7-tokenizer-7.2.19-r0 -php7-xml-7.2.18-r0 -php7-xmlwriter-7.2.18-r0 +php7-xml-7.2.19-r0 +php7-xmlwriter-7.2.19-r0 php7-zip-7.2.19-r0 popt-1.16-r7 readline-7.0.003-r1 From b6825c89111e1b502346f918f36117222e039b44 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 28 Jun 2019 18:00:51 -0700 Subject: [PATCH 059/262] Rebasing to Alpine 3.10 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 07436a5..dbcb2a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:3.9 +FROM lsiobase/nginx:3.10 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 70e959f..ab68642 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm64v8-3.9 +FROM lsiobase/nginx:arm64v8-3.10 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d254e9f..994674f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm32v7-3.9 +FROM lsiobase/nginx:arm32v7-3.10 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index dd94a1a..9ec1d50 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { 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." } From a03a8da1883d93bb504e5e182bc44bd560314723 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Jun 2019 20:24:10 +0100 Subject: [PATCH 060/262] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 482a79d..d06847e 100644 --- a/README.md +++ b/README.md @@ -194,6 +194,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **28.06.19:** - Rebasing to alpine 3.10. * **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. From aaf40620c56e409d6808dfc030c68dad49929c83 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Jun 2019 20:49:45 +0100 Subject: [PATCH 061/262] Bot Updating Package Versions --- package_versions.txt | 103 +++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4e69b46..970e499 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,67 +1,66 @@ -alpine-baselayout-3.1.0-r3 -alpine-keys-2.1-r1 +alpine-baselayout-3.1.2-r0 +alpine-keys-2.1-r2 apache2-utils-2.4.39-r0 -apk-tools-2.10.3-r1 +apk-tools-2.10.4-r1 apr-1.6.5-r0 -apr-util-1.6.1-r5 -bash-4.4.19-r1 -busybox-1.29.3-r10 +apr-util-1.6.1-r6 +bash-5.0.0-r0 +busybox-1.30.1-r2 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 -coreutils-8.30-r0 -curl-7.64.0-r2 +coreutils-8.31-r0 +curl-7.65.1-r0 expat-2.2.6-r0 -git-2.20.1-r0 -libacl-2.2.52-r5 -libattr-2.4.47-r7 +git-2.22.0-r0 +libacl-2.2.52-r6 +libattr-2.4.48-r0 libc-utils-0.7.1-r0 -libcrypto1.1-1.1.1b-r1 -libcurl-7.64.0-r2 -libedit-20181209.3.1-r0 -libmagic-5.36-r0 +libcrypto1.1-1.1.1c-r0 +libcurl-7.65.1-r0 +libedit-20190324.3.1-r0 +libmagic-5.37-r0 libressl2.7-libcrypto-2.7.5-r0 libressl2.7-libssl-2.7.5-r0 -libssh2-1.8.2-r0 -libssl1.1-1.1.1b-r1 -libtls-standalone-2.7.4-r6 -libuuid-2.33-r0 -libxml2-2.9.9-r1 -libzip-1.5.1-r2 -linux-pam-1.3.0-r0 +libssl1.1-1.1.1c-r0 +libtls-standalone-2.9.1-r0 +libuuid-2.33.2-r0 +libxml2-2.9.9-r2 +libzip-1.5.2-r0 +linux-pam-1.3.0-r1 logrotate-3.15.0-r0 -musl-1.1.20-r4 -musl-utils-1.1.20-r4 -nano-3.2-r0 -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-r1 -openssl-1.1.1b-r1 -pcre-8.42-r1 -pcre2-10.32-r1 -php7-7.2.19-r0 -php7-common-7.2.19-r0 -php7-ctype-7.2.19-r0 -php7-fileinfo-7.2.19-r0 -php7-fpm-7.2.19-r0 -php7-json-7.2.19-r0 -php7-mbstring-7.2.19-r0 -php7-openssl-7.2.19-r0 -php7-pdo-7.2.19-r0 -php7-pdo_sqlite-7.2.19-r0 -php7-session-7.2.19-r0 -php7-simplexml-7.2.19-r0 -php7-tokenizer-7.2.19-r0 -php7-xml-7.2.19-r0 -php7-xmlwriter-7.2.19-r0 -php7-zip-7.2.19-r0 +musl-1.1.22-r2 +musl-utils-1.1.22-r2 +nano-4.3-r0 +ncurses-libs-6.1_p20190518-r0 +ncurses-terminfo-6.1_p20190518-r0 +ncurses-terminfo-base-6.1_p20190518-r0 +nghttp2-libs-1.38.0-r0 +nginx-1.16.0-r2 +openssl-1.1.1c-r0 +pcre-8.43-r0 +pcre2-10.33-r0 +php7-7.3.6-r0 +php7-common-7.3.6-r0 +php7-ctype-7.3.6-r0 +php7-fileinfo-7.3.6-r0 +php7-fpm-7.3.6-r0 +php7-json-7.3.6-r0 +php7-mbstring-7.3.6-r0 +php7-openssl-7.3.6-r0 +php7-pdo-7.3.6-r0 +php7-pdo_sqlite-7.3.6-r0 +php7-session-7.3.6-r0 +php7-simplexml-7.3.6-r0 +php7-tokenizer-7.3.6-r0 +php7-xml-7.3.6-r0 +php7-xmlwriter-7.3.6-r0 +php7-zip-7.3.6-r0 popt-1.16-r7 -readline-7.0.003-r1 +readline-8.0.0-r0 scanelf-1.2.3-r0 -shadow-4.5-r2 +shadow-4.6-r2 sqlite-libs-3.28.0-r0 -ssl_client-1.29.3-r10 +ssl_client-1.30.1-r2 tar-1.32-r0 tzdata-2019a-r0 xz-5.2.4-r0 From f6abce49b81b9e85ab086b842ba4d92ff486497d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 5 Jul 2019 19:55:00 -0400 Subject: [PATCH 062/262] Bot Updating Templated Files --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index d06847e..4508934 100644 --- a/README.md +++ b/README.md @@ -171,6 +171,9 @@ Below are the instructions for updating containers: containrrr/watchtower \ --run-once heimdall ``` + +**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose. + * You can also remove the old dangling images: `docker image prune` ## Building locally From 42468518a5f6cc189eb3a7563b7cde82a053cadf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 13 Jul 2019 00:55:49 +0100 Subject: [PATCH 063/262] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 970e499..fc88368 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,21 +40,21 @@ openssl-1.1.1c-r0 pcre-8.43-r0 pcre2-10.33-r0 php7-7.3.6-r0 -php7-common-7.3.6-r0 -php7-ctype-7.3.6-r0 +php7-common-7.3.7-r0 +php7-ctype-7.3.7-r0 php7-fileinfo-7.3.6-r0 php7-fpm-7.3.6-r0 php7-json-7.3.6-r0 php7-mbstring-7.3.6-r0 php7-openssl-7.3.6-r0 -php7-pdo-7.3.6-r0 -php7-pdo_sqlite-7.3.6-r0 +php7-pdo-7.3.7-r0 +php7-pdo_sqlite-7.3.7-r0 php7-session-7.3.6-r0 php7-simplexml-7.3.6-r0 -php7-tokenizer-7.3.6-r0 +php7-tokenizer-7.3.7-r0 php7-xml-7.3.6-r0 php7-xmlwriter-7.3.6-r0 -php7-zip-7.3.6-r0 +php7-zip-7.3.7-r0 popt-1.16-r7 readline-8.0.0-r0 scanelf-1.2.3-r0 From b3e5cb11cbdea26bf5c606736034456bc1997bb4 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 16 Jul 2019 19:59:38 -0400 Subject: [PATCH 064/262] save laravel.log to /config --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 8 +++++++- root/etc/logrotate.d/heimdall | 9 +++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 root/etc/logrotate.d/heimdall diff --git a/README.md b/README.md index 4508934..bd06874 100644 --- a/README.md +++ b/README.md @@ -197,6 +197,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.07.19:** - Save laravel.log to /config/log/heimdall. * **28.06.19:** - Rebasing to alpine 3.10. * **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. diff --git a/readme-vars.yml b/readme-vars.yml index 9ec1d50..dce8523 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { 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." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index f15596d..6a104ef 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -3,7 +3,8 @@ # make our folders mkdir -p \ /config/www/{backgrounds,icons,avatars,SupportedApps} \ - /var/www/localhost/heimdall + /var/www/localhost/heimdall \ + /config/log/heimdall # install heimdall if necessary [[ -f /heimdall/heimdall.tar.gz ]] && \ @@ -32,6 +33,11 @@ do [[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i" done +[[ -e "/var/www/localhost/heimdall/storage/logs/laravel.log" && ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] \ + && rm -rf "/var/www/localhost/heimdall/storage/logs/laravel.log" +[[ ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] && \ + ln -s "/config/log/heimdall/laravel.log" "/var/www/localhost/heimdall/storage/logs/laravel.log" + # copy .env if not exists [[ ! -f /config/www/.env ]] && \ cp /var/www/localhost/heimdall/.env.example /config/www/.env && \ diff --git a/root/etc/logrotate.d/heimdall b/root/etc/logrotate.d/heimdall new file mode 100644 index 0000000..f777e6b --- /dev/null +++ b/root/etc/logrotate.d/heimdall @@ -0,0 +1,9 @@ +/config/log/heimdall/laravel.log { + size 5M + rotate 5 + compress + nodateext + notifempty + missingok + su abc abc +} \ No newline at end of file From d7840dc80231d048672909c72dc5586acface92c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 9 Aug 2019 23:55:40 +0000 Subject: [PATCH 065/262] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fc88368..47ea556 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ libxml2-2.9.9-r2 libzip-1.5.2-r0 linux-pam-1.3.0-r1 logrotate-3.15.0-r0 -musl-1.1.22-r2 +musl-1.1.22-r3 musl-utils-1.1.22-r2 nano-4.3-r0 ncurses-libs-6.1_p20190518-r0 @@ -40,21 +40,21 @@ openssl-1.1.1c-r0 pcre-8.43-r0 pcre2-10.33-r0 php7-7.3.6-r0 -php7-common-7.3.7-r0 -php7-ctype-7.3.7-r0 +php7-common-7.3.8-r0 +php7-ctype-7.3.8-r0 php7-fileinfo-7.3.6-r0 php7-fpm-7.3.6-r0 php7-json-7.3.6-r0 php7-mbstring-7.3.6-r0 php7-openssl-7.3.6-r0 -php7-pdo-7.3.7-r0 -php7-pdo_sqlite-7.3.7-r0 +php7-pdo-7.3.8-r0 +php7-pdo_sqlite-7.3.8-r0 php7-session-7.3.6-r0 php7-simplexml-7.3.6-r0 -php7-tokenizer-7.3.7-r0 +php7-tokenizer-7.3.8-r0 php7-xml-7.3.6-r0 php7-xmlwriter-7.3.6-r0 -php7-zip-7.3.7-r0 +php7-zip-7.3.8-r0 popt-1.16-r7 readline-8.0.0-r0 scanelf-1.2.3-r0 From 459218f07f527e27f580051079c933b6491f7b42 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 17 Aug 2019 00:58:43 +0100 Subject: [PATCH 066/262] Bot Updating Package Versions --- package_versions.txt | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 47ea556..7a42894 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,16 +1,17 @@ alpine-baselayout-3.1.2-r0 alpine-keys-2.1-r2 apache2-utils-2.4.39-r0 -apk-tools-2.10.4-r1 +apk-tools-2.10.4-r2 apr-1.6.5-r0 apr-util-1.6.1-r6 +argon2-libs-20171227-r2 bash-5.0.0-r0 busybox-1.30.1-r2 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 curl-7.65.1-r0 -expat-2.2.6-r0 +expat-2.2.7-r0 git-2.22.0-r0 libacl-2.2.52-r6 libattr-2.4.48-r0 @@ -29,31 +30,31 @@ libzip-1.5.2-r0 linux-pam-1.3.0-r1 logrotate-3.15.0-r0 musl-1.1.22-r3 -musl-utils-1.1.22-r2 +musl-utils-1.1.22-r3 nano-4.3-r0 ncurses-libs-6.1_p20190518-r0 ncurses-terminfo-6.1_p20190518-r0 ncurses-terminfo-base-6.1_p20190518-r0 nghttp2-libs-1.38.0-r0 -nginx-1.16.0-r2 +nginx-1.16.1-r0 openssl-1.1.1c-r0 pcre-8.43-r0 pcre2-10.33-r0 -php7-7.3.6-r0 +php7-7.3.8-r0 php7-common-7.3.8-r0 php7-ctype-7.3.8-r0 -php7-fileinfo-7.3.6-r0 -php7-fpm-7.3.6-r0 -php7-json-7.3.6-r0 -php7-mbstring-7.3.6-r0 -php7-openssl-7.3.6-r0 +php7-fileinfo-7.3.8-r0 +php7-fpm-7.3.8-r0 +php7-json-7.3.8-r0 +php7-mbstring-7.3.8-r0 +php7-openssl-7.3.8-r0 php7-pdo-7.3.8-r0 php7-pdo_sqlite-7.3.8-r0 -php7-session-7.3.6-r0 -php7-simplexml-7.3.6-r0 +php7-session-7.3.8-r0 +php7-simplexml-7.3.8-r0 php7-tokenizer-7.3.8-r0 -php7-xml-7.3.6-r0 -php7-xmlwriter-7.3.6-r0 +php7-xml-7.3.8-r0 +php7-xmlwriter-7.3.8-r0 php7-zip-7.3.8-r0 popt-1.16-r7 readline-8.0.0-r0 From 85a6be7169c82bbeecdf9e1d681b6ba1fe12abd7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 24 Aug 2019 00:56:26 +0100 Subject: [PATCH 067/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7a42894..caadf96 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,7 +35,7 @@ nano-4.3-r0 ncurses-libs-6.1_p20190518-r0 ncurses-terminfo-6.1_p20190518-r0 ncurses-terminfo-base-6.1_p20190518-r0 -nghttp2-libs-1.38.0-r0 +nghttp2-libs-1.39.2-r0 nginx-1.16.1-r0 openssl-1.1.1c-r0 pcre-8.43-r0 From d1fb1fdb0d09807f14b793508fde7f074f6d4a9a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 31 Aug 2019 00:55:57 +0100 Subject: [PATCH 068/262] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index caadf96..4b7293b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,21 +41,21 @@ openssl-1.1.1c-r0 pcre-8.43-r0 pcre2-10.33-r0 php7-7.3.8-r0 -php7-common-7.3.8-r0 -php7-ctype-7.3.8-r0 +php7-common-7.3.9-r0 +php7-ctype-7.3.9-r0 php7-fileinfo-7.3.8-r0 php7-fpm-7.3.8-r0 php7-json-7.3.8-r0 php7-mbstring-7.3.8-r0 php7-openssl-7.3.8-r0 -php7-pdo-7.3.8-r0 -php7-pdo_sqlite-7.3.8-r0 +php7-pdo-7.3.9-r0 +php7-pdo_sqlite-7.3.9-r0 php7-session-7.3.8-r0 php7-simplexml-7.3.8-r0 -php7-tokenizer-7.3.8-r0 +php7-tokenizer-7.3.9-r0 php7-xml-7.3.8-r0 php7-xmlwriter-7.3.8-r0 -php7-zip-7.3.8-r0 +php7-zip-7.3.9-r0 popt-1.16-r7 readline-8.0.0-r0 scanelf-1.2.3-r0 From 8fd28ab87e22fef43539644c0abd9eea2bf33537 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 7 Sep 2019 00:54:55 +0100 Subject: [PATCH 069/262] Bot Updating Templated Files --- Jenkinsfile | 15 +++++++++++++-- README.md | 40 +++++++++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 84fbe6a..fe0a7f0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,6 +60,14 @@ pipeline { echo none fi''', returnStdout: true).trim() + env.FUNDING_TAG = sh( + script: '''#!/bin/bash + if [ -e ./.github/FUNDING.yml ] ; then + cat ./.github/FUNDING.yml | md5sum | cut -c1-8 + else + echo none + fi''', + returnStdout: true).trim() } script{ env.LS_RELEASE_NUMBER = sh( @@ -234,15 +242,18 @@ pipeline { 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 }')" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then + [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \ + [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; 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}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml cd ${TEMPDIR}/repo/${LS_REPO}/ - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml 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} diff --git a/README.md b/README.md index bd06874..7796220 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) +[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") +[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") + The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- * regular and timely application updates @@ -9,17 +16,20 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r * regular security updates Find us at: -* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. -* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord. * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! +* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. +* [Discourse](https://discourse.linuxserver.io) - post on our community forum. +* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. +* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). +* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) -[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) -[![](https://images.microbadger.com/badges/version/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") -[![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") -![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg) -![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg) -[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-heimdall/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-heimdall/releases) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") +[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/heimdall) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/heimdall) +[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. @@ -30,7 +40,7 @@ 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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. @@ -137,17 +147,17 @@ This image now supports password protection through htpasswd. Run the following * Shell access whilst the container is running: `docker exec -it heimdall /bin/bash` * To monitor the logs of the container in realtime: `docker logs -f heimdall` -* container version number +* container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall` * image version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall` ## Updating Info -Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. - -Below are the instructions for updating containers: - +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. + +Below are the instructions for updating containers: + ### Via Docker Run/Create * Update the image: `docker pull linuxserver/heimdall` * Stop the running container: `docker stop heimdall` @@ -178,7 +188,7 @@ Below are the instructions for updating containers: ## Building locally -If you want to make local modifications to these images for development purposes or just to customize the logic: +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 From f6615088b1080ff0cd4f705dbf46fe7652caa144 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 Sep 2019 19:56:42 -0400 Subject: [PATCH 070/262] Bot Updating Templated Files --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100755 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100755 index 0000000..7972213 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: linuxserver From a115fbfd5351b7d067325d43f04f823350646c71 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Sep 2019 19:56:09 -0400 Subject: [PATCH 071/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4b7293b..667a3f5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,13 +16,13 @@ git-2.22.0-r0 libacl-2.2.52-r6 libattr-2.4.48-r0 libc-utils-0.7.1-r0 -libcrypto1.1-1.1.1c-r0 +libcrypto1.1-1.1.1d-r0 libcurl-7.65.1-r0 libedit-20190324.3.1-r0 libmagic-5.37-r0 libressl2.7-libcrypto-2.7.5-r0 libressl2.7-libssl-2.7.5-r0 -libssl1.1-1.1.1c-r0 +libssl1.1-1.1.1d-r0 libtls-standalone-2.9.1-r0 libuuid-2.33.2-r0 libxml2-2.9.9-r2 From c1f38384373253735344e8fef42b601b5861bc7c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Sep 2019 19:56:46 -0400 Subject: [PATCH 072/262] Bot Updating Package Versions --- package_versions.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 667a3f5..41672d1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.1.2-r0 alpine-keys-2.1-r2 -apache2-utils-2.4.39-r0 +apache2-utils-2.4.41-r0 apk-tools-2.10.4-r2 apr-1.6.5-r0 apr-util-1.6.1-r6 @@ -10,14 +10,14 @@ busybox-1.30.1-r2 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 -curl-7.65.1-r0 -expat-2.2.7-r0 +curl-7.66.0-r0 +expat-2.2.7-r1 git-2.22.0-r0 libacl-2.2.52-r6 libattr-2.4.48-r0 libc-utils-0.7.1-r0 libcrypto1.1-1.1.1d-r0 -libcurl-7.65.1-r0 +libcurl-7.66.0-r0 libedit-20190324.3.1-r0 libmagic-5.37-r0 libressl2.7-libcrypto-2.7.5-r0 @@ -37,24 +37,24 @@ ncurses-terminfo-6.1_p20190518-r0 ncurses-terminfo-base-6.1_p20190518-r0 nghttp2-libs-1.39.2-r0 nginx-1.16.1-r0 -openssl-1.1.1c-r0 +openssl-1.1.1d-r0 pcre-8.43-r0 pcre2-10.33-r0 -php7-7.3.8-r0 +php7-7.3.9-r0 php7-common-7.3.9-r0 php7-ctype-7.3.9-r0 -php7-fileinfo-7.3.8-r0 -php7-fpm-7.3.8-r0 -php7-json-7.3.8-r0 -php7-mbstring-7.3.8-r0 -php7-openssl-7.3.8-r0 +php7-fileinfo-7.3.9-r0 +php7-fpm-7.3.9-r0 +php7-json-7.3.9-r0 +php7-mbstring-7.3.9-r0 +php7-openssl-7.3.9-r0 php7-pdo-7.3.9-r0 php7-pdo_sqlite-7.3.9-r0 -php7-session-7.3.8-r0 -php7-simplexml-7.3.8-r0 +php7-session-7.3.9-r0 +php7-simplexml-7.3.9-r0 php7-tokenizer-7.3.9-r0 -php7-xml-7.3.8-r0 -php7-xmlwriter-7.3.8-r0 +php7-xml-7.3.9-r0 +php7-xmlwriter-7.3.9-r0 php7-zip-7.3.9-r0 popt-1.16-r7 readline-8.0.0-r0 @@ -63,7 +63,7 @@ shadow-4.6-r2 sqlite-libs-3.28.0-r0 ssl_client-1.30.1-r2 tar-1.32-r0 -tzdata-2019a-r0 +tzdata-2019b-r0 xz-5.2.4-r0 xz-libs-5.2.4-r0 zlib-1.2.11-r1 From f5a6466329455456b5c8cb6d3d1062c360296df9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 28 Sep 2019 00:58:01 +0100 Subject: [PATCH 073/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 41672d1..c45eb26 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 curl-7.66.0-r0 -expat-2.2.7-r1 +expat-2.2.8-r0 git-2.22.0-r0 libacl-2.2.52-r6 libattr-2.4.48-r0 From 50107e4b20a6e4da248f644910fae300614c63b3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Oct 2019 19:56:31 -0400 Subject: [PATCH 074/262] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c45eb26..91e7cc8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,21 +41,21 @@ openssl-1.1.1d-r0 pcre-8.43-r0 pcre2-10.33-r0 php7-7.3.9-r0 -php7-common-7.3.9-r0 -php7-ctype-7.3.9-r0 +php7-common-7.3.10-r0 +php7-ctype-7.3.10-r0 php7-fileinfo-7.3.9-r0 php7-fpm-7.3.9-r0 php7-json-7.3.9-r0 php7-mbstring-7.3.9-r0 php7-openssl-7.3.9-r0 -php7-pdo-7.3.9-r0 -php7-pdo_sqlite-7.3.9-r0 +php7-pdo-7.3.10-r0 +php7-pdo_sqlite-7.3.10-r0 php7-session-7.3.9-r0 php7-simplexml-7.3.9-r0 -php7-tokenizer-7.3.9-r0 +php7-tokenizer-7.3.10-r0 php7-xml-7.3.9-r0 php7-xmlwriter-7.3.9-r0 -php7-zip-7.3.9-r0 +php7-zip-7.3.10-r0 popt-1.16-r7 readline-8.0.0-r0 scanelf-1.2.3-r0 From 1c4cafefc0f7be9a800bd946569eb5d9da303f5c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 11 Oct 2019 19:55:57 -0400 Subject: [PATCH 075/262] Bot Updating Templated Files --- Jenkinsfile | 52 +++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe0a7f0..c82837c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,10 @@ pipeline { agent { label 'X86-64-MULTI' } + options { + buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60')) + parallelsAlwaysFailFast() + } // Input to determine if this is a package check parameters { string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') @@ -52,22 +56,7 @@ pipeline { 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 - env.LICENSE_TAG = sh( - script: '''#!/bin/bash - if [ -e LICENSE ] ; then - cat LICENSE | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() - env.FUNDING_TAG = sh( - script: '''#!/bin/bash - if [ -e ./.github/FUNDING.yml ] ; then - cat ./.github/FUNDING.yml | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md' } script{ env.LS_RELEASE_NUMBER = sh( @@ -238,35 +227,32 @@ pipeline { 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 }')" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \ - [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; 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}/ - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml - 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 + git add ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + 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 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 - cp ${TEMPDIR}/${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + 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}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Templated Files' + git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi rm -Rf ${TEMPDIR}''' From e6419e3c26a3b4d48dcb79207e1b506e9022408e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Oct 2019 00:56:47 +0100 Subject: [PATCH 076/262] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 +++++++++++++++++++++----------- .github/PULL_REQUEST_TEMPLATE.md | 30 +++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index c73c33b..33210db 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,21 +1,34 @@ - - [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - +If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. - - - - + +------------------------------ - +## Expected Behavior + - - +## Current Behavior + -## Thanks, team linuxserver.io +## Steps to Reproduce + + +1. +2. +3. +4. +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f6a6381..26d5031 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,10 +6,34 @@ - + + - + -## Thanks, team linuxserver.io + + + + + + +------------------------------ + +We welcome all PR’s though this doesn’t guarantee it will be accepted. + +## Description: + + +## Benefits of this PR and context: + + +## How Has This Been Tested? + + + + + +## Source / References: + From c167fda7f3b9a4e76995dbae2df725732bcee8e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 11 Oct 2019 19:58:24 -0400 Subject: [PATCH 077/262] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 91e7cc8..474a9ca 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,27 +40,27 @@ nginx-1.16.1-r0 openssl-1.1.1d-r0 pcre-8.43-r0 pcre2-10.33-r0 -php7-7.3.9-r0 +php7-7.3.10-r0 php7-common-7.3.10-r0 php7-ctype-7.3.10-r0 -php7-fileinfo-7.3.9-r0 -php7-fpm-7.3.9-r0 -php7-json-7.3.9-r0 -php7-mbstring-7.3.9-r0 -php7-openssl-7.3.9-r0 +php7-fileinfo-7.3.10-r0 +php7-fpm-7.3.10-r0 +php7-json-7.3.10-r0 +php7-mbstring-7.3.10-r0 +php7-openssl-7.3.10-r0 php7-pdo-7.3.10-r0 php7-pdo_sqlite-7.3.10-r0 -php7-session-7.3.9-r0 -php7-simplexml-7.3.9-r0 +php7-session-7.3.10-r0 +php7-simplexml-7.3.10-r0 php7-tokenizer-7.3.10-r0 -php7-xml-7.3.9-r0 -php7-xmlwriter-7.3.9-r0 +php7-xml-7.3.10-r0 +php7-xmlwriter-7.3.10-r0 php7-zip-7.3.10-r0 popt-1.16-r7 readline-8.0.0-r0 scanelf-1.2.3-r0 shadow-4.6-r2 -sqlite-libs-3.28.0-r0 +sqlite-libs-3.28.0-r1 ssl_client-1.30.1-r2 tar-1.32-r0 tzdata-2019b-r0 From 0a4a9371db69a71b0250e3d0bbc0357fa407f05d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 25 Oct 2019 19:57:57 -0400 Subject: [PATCH 078/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 474a9ca..2420851 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ shadow-4.6-r2 sqlite-libs-3.28.0-r1 ssl_client-1.30.1-r2 tar-1.32-r0 -tzdata-2019b-r0 +tzdata-2019c-r0 xz-5.2.4-r0 xz-libs-5.2.4-r0 zlib-1.2.11-r1 From 94e161129c8ea679ecd6ea4c32b5ffa969affe5f Mon Sep 17 00:00:00 2001 From: brechsteiner Date: Mon, 28 Oct 2019 17:07:59 +0100 Subject: [PATCH 079/262] add pgsql driver --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index dbcb2a9..93a5167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN \ nginx \ php7-ctype \ php7-pdo_sqlite \ + php7-pgsql \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ab68642..1d04c61 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -17,6 +17,7 @@ RUN \ nginx \ php7-ctype \ php7-pdo_sqlite \ + php7-pgsql \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 994674f..8ad5614 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -17,6 +17,7 @@ RUN \ nginx \ php7-ctype \ php7-pdo_sqlite \ + php7-pgsql \ php7-tokenizer \ php7-zip \ tar && \ From 90badb2245127f0bbfdb461c2ff829533e92b9fe Mon Sep 17 00:00:00 2001 From: brechsteiner Date: Mon, 28 Oct 2019 17:37:51 +0100 Subject: [PATCH 080/262] change package --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93a5167..c5259ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN \ nginx \ php7-ctype \ php7-pdo_sqlite \ - php7-pgsql \ + php7-pdo_pgsql \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1d04c61..a5c9550 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -17,7 +17,7 @@ RUN \ nginx \ php7-ctype \ php7-pdo_sqlite \ - php7-pgsql \ + php7-pdo_pgsql \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8ad5614..fe1d525 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -17,7 +17,7 @@ RUN \ nginx \ php7-ctype \ php7-pdo_sqlite \ - php7-pgsql \ + php7-pdo_pgsql \ php7-tokenizer \ php7-zip \ tar && \ From 0c2f2a481ee006f3a4f45fc5b8726f7142b4a112 Mon Sep 17 00:00:00 2001 From: brechsteiner Date: Tue, 29 Oct 2019 08:23:21 +0100 Subject: [PATCH 081/262] change order --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c5259ad..8c4f402 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,8 @@ RUN \ curl \ nginx \ php7-ctype \ - php7-pdo_sqlite \ php7-pdo_pgsql \ + php7-pdo_sqlite \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a5c9550..dd9716d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,8 +16,8 @@ RUN \ curl \ nginx \ php7-ctype \ - php7-pdo_sqlite \ php7-pdo_pgsql \ + php7-pdo_sqlite \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index fe1d525..2d42872 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -16,8 +16,8 @@ RUN \ curl \ nginx \ php7-ctype \ - php7-pdo_sqlite \ php7-pdo_pgsql \ + php7-pdo_sqlite \ php7-tokenizer \ php7-zip \ tar && \ From f5f09c95eb82239831335e1b480798e408e02184 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 Nov 2019 13:59:24 +0000 Subject: [PATCH 082/262] Bot Updating Templated Files --- Jenkinsfile | 162 +++++++++++++++++++++++++++++++++++++++------------- README.md | 16 ++++-- 2 files changed, 133 insertions(+), 45 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c82837c..d5db432 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,8 @@ pipeline { environment { BUILDS_DISCORD=credentials('build_webhook_url') GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') + GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') + GITLAB_NAMESPACE=credentials('gitlab-namespace-id') EXT_GIT_BRANCH = 'master' EXT_USER = 'linuxserver' EXT_REPO = 'Heimdall' @@ -136,6 +138,9 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -154,6 +159,9 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + 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 { @@ -172,6 +180,9 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + 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 { @@ -279,6 +290,26 @@ pipeline { } } } + /* ####################### + GitLab Mirroring + ####################### */ + // Ping into Gitlab to mirror this repo and have a registry endpoint + stage("GitLab Mirror"){ + when { + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + } + } /* ############### Build Container ############### */ @@ -510,19 +541,32 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { - echo 'Logging into DockerHub' sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + 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}:latest + docker push ${PUSHIMAGE}:latest + docker push ${PUSHIMAGE}:${META_TAG} + done + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:latest || : + done ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" - sh "docker push ${IMAGE}:latest" - sh "docker push ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:${META_TAG} \ - ${IMAGE}:latest || :''' - } } } @@ -539,46 +583,81 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin if [ "${CI}" == "false" ]; then docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} 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-latest" - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" - 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-latest" - sh "docker push ${IMAGE}:arm32v7-latest" - sh "docker push ${IMAGE}:arm64v8-latest" - sh "docker manifest push --purge ${IMAGE}:latest || :" - sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-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}: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}:latest" - sh "docker manifest push --purge ${IMAGE}:${META_TAG}" - sh '''docker rmi \ - ${IMAGE}:amd64-${META_TAG} \ - ${IMAGE}:amd64-latest \ - ${IMAGE}:arm32v7-${META_TAG} \ - ${IMAGE}:arm32v7-latest \ - ${IMAGE}:arm64v8-${META_TAG} \ - ${IMAGE}:arm64v8-latest \ + fi + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + 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-latest + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-latest + docker push ${MANIFESTIMAGE}:arm64v8-latest + docker manifest push --purge ${MANIFESTIMAGE}:latest || : + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + done + for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; 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}:latest + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:latest + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-latest + docker push ${LEGACYIMAGE}:arm64v8-latest + done + ''' + sh '''#! /bin/bash + for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + docker rmi \ + ${DELETEIMAGE}:amd64-${META_TAG} \ + ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:arm32v7-${META_TAG} \ + ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm64v8-${META_TAG} \ + ${DELETEIMAGE}:arm64v8-latest || : + done + docker rmi \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ''' } } } @@ -673,5 +752,8 @@ pipeline { } } } + cleanup { + cleanWs() + } } } diff --git a/README.md b/README.md index 7796220..34983d7 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ [![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") [![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- @@ -20,15 +21,20 @@ Find us at: * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. +* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-heimdall/releases) + +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-heimdall.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-heimdall) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-heimdall/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-heimdall/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-heimdall/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/heimdall) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") -[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/heimdall) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/heimdall) +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/heimdall) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/heimdall) [![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) [![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) From c9bcd0519cd2058f9f4730b88c189d149186c1c9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 Nov 2019 14:01:17 +0000 Subject: [PATCH 083/262] Bot Updating Package Versions --- package_versions.txt | 45 ++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2420851..ff32d1a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,11 +6,12 @@ apr-1.6.5-r0 apr-util-1.6.1-r6 argon2-libs-20171227-r2 bash-5.0.0-r0 -busybox-1.30.1-r2 +busybox-1.30.1-r3 ca-certificates-20190108-r0 ca-certificates-cacert-20190108-r0 coreutils-8.31-r0 curl-7.66.0-r0 +db-5.3.28-r1 expat-2.2.8-r0 git-2.22.0-r0 libacl-2.2.52-r6 @@ -19,9 +20,12 @@ libc-utils-0.7.1-r0 libcrypto1.1-1.1.1d-r0 libcurl-7.66.0-r0 libedit-20190324.3.1-r0 -libmagic-5.37-r0 +libldap-2.4.48-r0 +libmagic-5.37-r1 +libpq-11.5-r1 libressl2.7-libcrypto-2.7.5-r0 libressl2.7-libssl-2.7.5-r0 +libsasl-2.1.27-r3 libssl1.1-1.1.1d-r0 libtls-standalone-2.9.1-r0 libuuid-2.33.2-r0 @@ -36,32 +40,33 @@ ncurses-libs-6.1_p20190518-r0 ncurses-terminfo-6.1_p20190518-r0 ncurses-terminfo-base-6.1_p20190518-r0 nghttp2-libs-1.39.2-r0 -nginx-1.16.1-r0 +nginx-1.16.1-r1 openssl-1.1.1d-r0 pcre-8.43-r0 pcre2-10.33-r0 -php7-7.3.10-r0 -php7-common-7.3.10-r0 -php7-ctype-7.3.10-r0 -php7-fileinfo-7.3.10-r0 -php7-fpm-7.3.10-r0 -php7-json-7.3.10-r0 -php7-mbstring-7.3.10-r0 -php7-openssl-7.3.10-r0 -php7-pdo-7.3.10-r0 -php7-pdo_sqlite-7.3.10-r0 -php7-session-7.3.10-r0 -php7-simplexml-7.3.10-r0 -php7-tokenizer-7.3.10-r0 -php7-xml-7.3.10-r0 -php7-xmlwriter-7.3.10-r0 -php7-zip-7.3.10-r0 +php7-7.3.11-r0 +php7-common-7.3.11-r0 +php7-ctype-7.3.11-r0 +php7-fileinfo-7.3.11-r0 +php7-fpm-7.3.11-r0 +php7-json-7.3.11-r0 +php7-mbstring-7.3.11-r0 +php7-openssl-7.3.11-r0 +php7-pdo-7.3.11-r0 +php7-pdo_pgsql-7.3.11-r0 +php7-pdo_sqlite-7.3.11-r0 +php7-session-7.3.11-r0 +php7-simplexml-7.3.11-r0 +php7-tokenizer-7.3.11-r0 +php7-xml-7.3.11-r0 +php7-xmlwriter-7.3.11-r0 +php7-zip-7.3.11-r0 popt-1.16-r7 readline-8.0.0-r0 scanelf-1.2.3-r0 shadow-4.6-r2 sqlite-libs-3.28.0-r1 -ssl_client-1.30.1-r2 +ssl_client-1.30.1-r3 tar-1.32-r0 tzdata-2019c-r0 xz-5.2.4-r0 From bdd6c709d83fee421c151ede06f9b12cd247dd92 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 22 Nov 2019 19:56:18 -0500 Subject: [PATCH 084/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ff32d1a..df6ddbd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ libcurl-7.66.0-r0 libedit-20190324.3.1-r0 libldap-2.4.48-r0 libmagic-5.37-r1 -libpq-11.5-r1 +libpq-11.6-r0 libressl2.7-libcrypto-2.7.5-r0 libressl2.7-libssl-2.7.5-r0 libsasl-2.1.27-r3 From 4509bda804f8c273d29d1a75786728a62b0f4089 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 30 Nov 2019 00:54:51 +0000 Subject: [PATCH 085/262] Bot Updating Templated Files --- Jenkinsfile | 6 +++--- README.md | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d5db432..5b81baa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -627,7 +627,7 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done - for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do + 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} @@ -741,12 +741,12 @@ pipeline { 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,\ + sh ''' curl -X POST -H "Content-Type: application/json" --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**ShellCheck Results:** '${SHELLCHECK_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,\ + sh ''' curl -X POST -H "Content-Type: application/json" --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**ShellCheck Results:** '${SHELLCHECK_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 34983d7..9712737 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- @@ -22,7 +21,6 @@ Find us at: * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. -* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018). * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) @@ -123,6 +121,18 @@ Container images are configured using parameters passed at runtime (such as thos | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London | | `-v /config` | Contains all relevant configuration files. | +## Environment variables from files (Docker secrets) + +You can set any environment variable from a file by using a special prepend `FILE__`. + +As an example: + +``` +-e FILE__PASSWORD=/run/secrets/mysecretpassword +``` + +Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. + ## User / Group Identifiers When using 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`. From cbf8afe840d67e6a53b042d008f013f4ed6eefd7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 14 Dec 2019 00:57:27 +0000 Subject: [PATCH 086/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index df6ddbd..eec3dbe 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ coreutils-8.31-r0 curl-7.66.0-r0 db-5.3.28-r1 expat-2.2.8-r0 -git-2.22.0-r0 +git-2.22.2-r0 libacl-2.2.52-r6 libattr-2.4.48-r0 libc-utils-0.7.1-r0 From 79c12d25c6fc173b5203c2bb02c531d6d17ee5d1 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 19 Dec 2019 17:00:42 -0800 Subject: [PATCH 087/262] Rebasing to Alpine 3.11 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c4f402..08453fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:3.10 +FROM lsiobase/nginx:3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dd9716d..de548ad 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm64v8-3.10 +FROM lsiobase/nginx:arm64v8-3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2d42872..f07221b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm32v7-3.10 +FROM lsiobase/nginx:arm32v7-3.11 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index dce8523..b329d7c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "01.04.19:", desc: "Fix permission detect logic." } From 146710ba2221c06fca2ec9966f7fe1f190dc8dde Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Dec 2019 22:00:34 +0000 Subject: [PATCH 088/262] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9712737..a36c415 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.12.19:** - Rebasing to alpine 3.11. * **16.07.19:** - Save laravel.log to /config/log/heimdall. * **28.06.19:** - Rebasing to alpine 3.10. * **01.04.19:** - Fix permission detect logic. From ef0a2ef1b4f014ab9286b7d7a37ef0aa9fd17a17 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Dec 2019 17:02:55 -0500 Subject: [PATCH 089/262] Bot Updating Package Versions --- package_versions.txt | 120 +++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index eec3dbe..7dc6994 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,74 +1,74 @@ -alpine-baselayout-3.1.2-r0 +alpine-baselayout-3.2.0-r3 alpine-keys-2.1-r2 apache2-utils-2.4.41-r0 -apk-tools-2.10.4-r2 -apr-1.6.5-r0 +apk-tools-2.10.4-r3 +apr-1.7.0-r0 apr-util-1.6.1-r6 -argon2-libs-20171227-r2 -bash-5.0.0-r0 -busybox-1.30.1-r3 -ca-certificates-20190108-r0 -ca-certificates-cacert-20190108-r0 +argon2-libs-20190702-r1 +bash-5.0.11-r1 +busybox-1.31.1-r8 +ca-certificates-20191127-r0 +ca-certificates-cacert-20191127-r0 coreutils-8.31-r0 -curl-7.66.0-r0 +curl-7.67.0-r0 db-5.3.28-r1 -expat-2.2.8-r0 -git-2.22.2-r0 -libacl-2.2.52-r6 +expat-2.2.9-r0 +git-2.24.1-r0 +libacl-2.2.53-r0 libattr-2.4.48-r0 -libc-utils-0.7.1-r0 -libcrypto1.1-1.1.1d-r0 -libcurl-7.66.0-r0 -libedit-20190324.3.1-r0 -libldap-2.4.48-r0 +libc-utils-0.7.2-r0 +libcrypto1.1-1.1.1d-r2 +libcurl-7.67.0-r0 +libedit-20191211.3.1-r0 +libldap-2.4.48-r1 libmagic-5.37-r1 -libpq-11.6-r0 -libressl2.7-libcrypto-2.7.5-r0 -libressl2.7-libssl-2.7.5-r0 -libsasl-2.1.27-r3 -libssl1.1-1.1.1d-r0 +libpq-12.1-r0 +libressl3.0-libcrypto-3.0.2-r0 +libressl3.0-libssl-3.0.2-r0 +libsasl-2.1.27-r4 +libssl1.1-1.1.1d-r2 libtls-standalone-2.9.1-r0 -libuuid-2.33.2-r0 -libxml2-2.9.9-r2 +libuuid-2.34-r1 +libxml2-2.9.10-r1 libzip-1.5.2-r0 -linux-pam-1.3.0-r1 -logrotate-3.15.0-r0 -musl-1.1.22-r3 -musl-utils-1.1.22-r3 -nano-4.3-r0 -ncurses-libs-6.1_p20190518-r0 -ncurses-terminfo-6.1_p20190518-r0 -ncurses-terminfo-base-6.1_p20190518-r0 -nghttp2-libs-1.39.2-r0 -nginx-1.16.1-r1 -openssl-1.1.1d-r0 +linux-pam-1.3.1-r1 +logrotate-3.15.1-r0 +musl-1.1.24-r0 +musl-utils-1.1.24-r0 +nano-4.6-r0 +ncurses-libs-6.1_p20191130-r0 +ncurses-terminfo-6.1_p20191130-r0 +ncurses-terminfo-base-6.1_p20191130-r0 +nghttp2-libs-1.40.0-r0 +nginx-1.16.1-r4 +openssl-1.1.1d-r2 pcre-8.43-r0 -pcre2-10.33-r0 -php7-7.3.11-r0 -php7-common-7.3.11-r0 -php7-ctype-7.3.11-r0 -php7-fileinfo-7.3.11-r0 -php7-fpm-7.3.11-r0 -php7-json-7.3.11-r0 -php7-mbstring-7.3.11-r0 -php7-openssl-7.3.11-r0 -php7-pdo-7.3.11-r0 -php7-pdo_pgsql-7.3.11-r0 -php7-pdo_sqlite-7.3.11-r0 -php7-session-7.3.11-r0 -php7-simplexml-7.3.11-r0 -php7-tokenizer-7.3.11-r0 -php7-xml-7.3.11-r0 -php7-xmlwriter-7.3.11-r0 -php7-zip-7.3.11-r0 +pcre2-10.34-r0 +php7-7.3.12-r1 +php7-common-7.3.13-r0 +php7-ctype-7.3.13-r0 +php7-fileinfo-7.3.12-r1 +php7-fpm-7.3.12-r1 +php7-json-7.3.12-r1 +php7-mbstring-7.3.12-r1 +php7-openssl-7.3.12-r1 +php7-pdo-7.3.13-r0 +php7-pdo_pgsql-7.3.13-r0 +php7-pdo_sqlite-7.3.13-r0 +php7-session-7.3.12-r1 +php7-simplexml-7.3.12-r1 +php7-tokenizer-7.3.13-r0 +php7-xml-7.3.12-r1 +php7-xmlwriter-7.3.12-r1 +php7-zip-7.3.13-r0 popt-1.16-r7 -readline-8.0.0-r0 -scanelf-1.2.3-r0 -shadow-4.6-r2 -sqlite-libs-3.28.0-r1 -ssl_client-1.30.1-r3 -tar-1.32-r0 +readline-8.0.1-r0 +scanelf-1.2.4-r0 +shadow-4.7-r0 +sqlite-libs-3.30.1-r1 +ssl_client-1.31.1-r8 +tar-1.32-r1 tzdata-2019c-r0 xz-5.2.4-r0 xz-libs-5.2.4-r0 -zlib-1.2.11-r1 +zlib-1.2.11-r3 From 2d88de22171bd252cec23c4ac36a1135dded9524 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 27 Dec 2019 19:57:14 -0500 Subject: [PATCH 090/262] Bot Updating Package Versions --- package_versions.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7dc6994..76fd048 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,12 +12,12 @@ ca-certificates-cacert-20191127-r0 coreutils-8.31-r0 curl-7.67.0-r0 db-5.3.28-r1 -expat-2.2.9-r0 +expat-2.2.9-r1 git-2.24.1-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r0 -libcrypto1.1-1.1.1d-r2 +libcrypto1.1-1.1.1d-r3 libcurl-7.67.0-r0 libedit-20191211.3.1-r0 libldap-2.4.48-r1 @@ -25,8 +25,8 @@ libmagic-5.37-r1 libpq-12.1-r0 libressl3.0-libcrypto-3.0.2-r0 libressl3.0-libssl-3.0.2-r0 -libsasl-2.1.27-r4 -libssl1.1-1.1.1d-r2 +libsasl-2.1.27-r5 +libssl1.1-1.1.1d-r3 libtls-standalone-2.9.1-r0 libuuid-2.34-r1 libxml2-2.9.10-r1 @@ -43,23 +43,23 @@ nghttp2-libs-1.40.0-r0 nginx-1.16.1-r4 openssl-1.1.1d-r2 pcre-8.43-r0 -pcre2-10.34-r0 -php7-7.3.12-r1 +pcre2-10.34-r1 +php7-7.3.13-r0 php7-common-7.3.13-r0 php7-ctype-7.3.13-r0 -php7-fileinfo-7.3.12-r1 -php7-fpm-7.3.12-r1 -php7-json-7.3.12-r1 -php7-mbstring-7.3.12-r1 -php7-openssl-7.3.12-r1 +php7-fileinfo-7.3.13-r0 +php7-fpm-7.3.13-r0 +php7-json-7.3.13-r0 +php7-mbstring-7.3.13-r0 +php7-openssl-7.3.13-r0 php7-pdo-7.3.13-r0 php7-pdo_pgsql-7.3.13-r0 php7-pdo_sqlite-7.3.13-r0 -php7-session-7.3.12-r1 -php7-simplexml-7.3.12-r1 +php7-session-7.3.13-r0 +php7-simplexml-7.3.13-r0 php7-tokenizer-7.3.13-r0 -php7-xml-7.3.12-r1 -php7-xmlwriter-7.3.12-r1 +php7-xml-7.3.13-r0 +php7-xmlwriter-7.3.13-r0 php7-zip-7.3.13-r0 popt-1.16-r7 readline-8.0.1-r0 From 684e3fa2bd616b1cc31b042831577c5651e42a0e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 18 Jan 2020 01:58:23 +0100 Subject: [PATCH 091/262] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 76fd048..e75b561 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 bash-5.0.11-r1 -busybox-1.31.1-r8 +busybox-1.31.1-r9 ca-certificates-20191127-r0 ca-certificates-cacert-20191127-r0 coreutils-8.31-r0 @@ -40,8 +40,8 @@ ncurses-libs-6.1_p20191130-r0 ncurses-terminfo-6.1_p20191130-r0 ncurses-terminfo-base-6.1_p20191130-r0 nghttp2-libs-1.40.0-r0 -nginx-1.16.1-r4 -openssl-1.1.1d-r2 +nginx-1.16.1-r6 +openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 php7-7.3.13-r0 @@ -64,9 +64,9 @@ php7-zip-7.3.13-r0 popt-1.16-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 -shadow-4.7-r0 +shadow-4.7-r1 sqlite-libs-3.30.1-r1 -ssl_client-1.31.1-r8 +ssl_client-1.31.1-r9 tar-1.32-r1 tzdata-2019c-r0 xz-5.2.4-r0 From 03cea49daaf11c39a6dfde3bc18a6b8142df3bd7 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 17 Jan 2020 23:04:25 -0500 Subject: [PATCH 092/262] Use nginx from baseimage --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - Dockerfile.armhf | 1 - README.md | 1 + readme-vars.yml | 1 + 5 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 08453fc..3110f52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,6 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ curl \ - nginx \ php7-ctype \ php7-pdo_pgsql \ php7-pdo_sqlite \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index de548ad..7356b2e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -14,7 +14,6 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ curl \ - nginx \ php7-ctype \ php7-pdo_pgsql \ php7-pdo_sqlite \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f07221b..e50af62 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -14,7 +14,6 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ curl \ - nginx \ php7-ctype \ php7-pdo_pgsql \ php7-pdo_sqlite \ diff --git a/README.md b/README.md index a36c415..2581f49 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.01.20:** - Use nginx from baseimage. * **19.12.19:** - Rebasing to alpine 3.11. * **16.07.19:** - Save laravel.log to /config/log/heimdall. * **28.06.19:** - Rebasing to alpine 3.10. diff --git a/readme-vars.yml b/readme-vars.yml index b329d7c..bcb7d56 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.01.20:", desc: "Use nginx from baseimage." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } From 583ddfa1dad1070b637df87d9f81fb5476042261 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 17 Jan 2020 23:38:34 -0500 Subject: [PATCH 093/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e75b561..072eaf7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ ncurses-libs-6.1_p20191130-r0 ncurses-terminfo-6.1_p20191130-r0 ncurses-terminfo-base-6.1_p20191130-r0 nghttp2-libs-1.40.0-r0 -nginx-1.16.1-r6 +nginx-1.16.1-r4 openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 From 259c34085b2b27f7f87847247053687d2597547a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 25 Jan 2020 01:56:39 +0100 Subject: [PATCH 094/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 072eaf7..e75b561 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -40,7 +40,7 @@ ncurses-libs-6.1_p20191130-r0 ncurses-terminfo-6.1_p20191130-r0 ncurses-terminfo-base-6.1_p20191130-r0 nghttp2-libs-1.40.0-r0 -nginx-1.16.1-r4 +nginx-1.16.1-r6 openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 From 16b07a262235241a3415a7e5e1764e96c3eaea16 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 1 Feb 2020 00:57:34 +0000 Subject: [PATCH 095/262] Bot Updating Package Versions --- package_versions.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e75b561..2223ea6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -44,23 +44,23 @@ nginx-1.16.1-r6 openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 -php7-7.3.13-r0 -php7-common-7.3.13-r0 -php7-ctype-7.3.13-r0 -php7-fileinfo-7.3.13-r0 -php7-fpm-7.3.13-r0 -php7-json-7.3.13-r0 -php7-mbstring-7.3.13-r0 -php7-openssl-7.3.13-r0 -php7-pdo-7.3.13-r0 -php7-pdo_pgsql-7.3.13-r0 -php7-pdo_sqlite-7.3.13-r0 -php7-session-7.3.13-r0 -php7-simplexml-7.3.13-r0 -php7-tokenizer-7.3.13-r0 -php7-xml-7.3.13-r0 -php7-xmlwriter-7.3.13-r0 -php7-zip-7.3.13-r0 +php7-7.3.14-r0 +php7-common-7.3.14-r0 +php7-ctype-7.3.14-r0 +php7-fileinfo-7.3.14-r0 +php7-fpm-7.3.14-r0 +php7-json-7.3.14-r0 +php7-mbstring-7.3.14-r0 +php7-openssl-7.3.14-r0 +php7-pdo-7.3.14-r0 +php7-pdo_pgsql-7.3.14-r0 +php7-pdo_sqlite-7.3.14-r0 +php7-session-7.3.14-r0 +php7-simplexml-7.3.14-r0 +php7-tokenizer-7.3.14-r0 +php7-xml-7.3.14-r0 +php7-xmlwriter-7.3.14-r0 +php7-zip-7.3.14-r0 popt-1.16-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 From 234c90aae09377358338ce59376c695d957b4bba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 8 Feb 2020 00:58:07 +0000 Subject: [PATCH 096/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2223ea6..d84693d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,8 +7,8 @@ apr-util-1.6.1-r6 argon2-libs-20190702-r1 bash-5.0.11-r1 busybox-1.31.1-r9 -ca-certificates-20191127-r0 -ca-certificates-cacert-20191127-r0 +ca-certificates-20191127-r1 +ca-certificates-cacert-20191127-r1 coreutils-8.31-r0 curl-7.67.0-r0 db-5.3.28-r1 From 35d67db85780fc38ad482d4381125bca71ad564b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Feb 2020 19:55:56 -0500 Subject: [PATCH 097/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d84693d..c5b4a1f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,14 +22,14 @@ libcurl-7.67.0-r0 libedit-20191211.3.1-r0 libldap-2.4.48-r1 libmagic-5.37-r1 -libpq-12.1-r0 +libpq-12.2-r0 libressl3.0-libcrypto-3.0.2-r0 libressl3.0-libssl-3.0.2-r0 libsasl-2.1.27-r5 libssl1.1-1.1.1d-r3 libtls-standalone-2.9.1-r0 libuuid-2.34-r1 -libxml2-2.9.10-r1 +libxml2-2.9.10-r2 libzip-1.5.2-r0 linux-pam-1.3.1-r1 logrotate-3.15.1-r0 From 65e7ad2636718ab3336ab31eac0e7346226dc2c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 28 Feb 2020 19:56:51 -0500 Subject: [PATCH 098/262] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c5b4a1f..6749a18 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,22 +45,22 @@ openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 php7-7.3.14-r0 -php7-common-7.3.14-r0 -php7-ctype-7.3.14-r0 +php7-common-7.3.15-r0 +php7-ctype-7.3.15-r0 php7-fileinfo-7.3.14-r0 php7-fpm-7.3.14-r0 php7-json-7.3.14-r0 php7-mbstring-7.3.14-r0 php7-openssl-7.3.14-r0 -php7-pdo-7.3.14-r0 -php7-pdo_pgsql-7.3.14-r0 -php7-pdo_sqlite-7.3.14-r0 +php7-pdo-7.3.15-r0 +php7-pdo_pgsql-7.3.15-r0 +php7-pdo_sqlite-7.3.15-r0 php7-session-7.3.14-r0 php7-simplexml-7.3.14-r0 -php7-tokenizer-7.3.14-r0 +php7-tokenizer-7.3.15-r0 php7-xml-7.3.14-r0 php7-xmlwriter-7.3.14-r0 -php7-zip-7.3.14-r0 +php7-zip-7.3.15-r0 popt-1.16-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 From 3c67dd641939f1f6b71d15093c7c1cc888325294 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 Mar 2020 19:56:20 -0500 Subject: [PATCH 099/262] Bot Updating Package Versions --- package_versions.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6749a18..b0d7245 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -33,33 +33,32 @@ libxml2-2.9.10-r2 libzip-1.5.2-r0 linux-pam-1.3.1-r1 logrotate-3.15.1-r0 -musl-1.1.24-r0 +musl-1.1.24-r1 musl-utils-1.1.24-r0 nano-4.6-r0 -ncurses-libs-6.1_p20191130-r0 -ncurses-terminfo-6.1_p20191130-r0 -ncurses-terminfo-base-6.1_p20191130-r0 +ncurses-libs-6.1_p20200118-r2 +ncurses-terminfo-base-6.1_p20200118-r2 nghttp2-libs-1.40.0-r0 nginx-1.16.1-r6 openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 -php7-7.3.14-r0 +php7-7.3.15-r0 php7-common-7.3.15-r0 php7-ctype-7.3.15-r0 -php7-fileinfo-7.3.14-r0 -php7-fpm-7.3.14-r0 -php7-json-7.3.14-r0 -php7-mbstring-7.3.14-r0 -php7-openssl-7.3.14-r0 +php7-fileinfo-7.3.15-r0 +php7-fpm-7.3.15-r0 +php7-json-7.3.15-r0 +php7-mbstring-7.3.15-r0 +php7-openssl-7.3.15-r0 php7-pdo-7.3.15-r0 php7-pdo_pgsql-7.3.15-r0 php7-pdo_sqlite-7.3.15-r0 -php7-session-7.3.14-r0 -php7-simplexml-7.3.14-r0 +php7-session-7.3.15-r0 +php7-simplexml-7.3.15-r0 php7-tokenizer-7.3.15-r0 -php7-xml-7.3.14-r0 -php7-xmlwriter-7.3.14-r0 +php7-xml-7.3.15-r0 +php7-xmlwriter-7.3.15-r0 php7-zip-7.3.15-r0 popt-1.16-r7 readline-8.0.1-r0 From aa636d17d7d030f4448064246410233997b8d8ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 14 Mar 2020 00:56:14 +0000 Subject: [PATCH 100/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b0d7245..57f5c40 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,7 +34,7 @@ libzip-1.5.2-r0 linux-pam-1.3.1-r1 logrotate-3.15.1-r0 musl-1.1.24-r1 -musl-utils-1.1.24-r0 +musl-utils-1.1.24-r1 nano-4.6-r0 ncurses-libs-6.1_p20200118-r2 ncurses-terminfo-base-6.1_p20200118-r2 From 87a0fae6b82f85fad1ff68ba0e7ad6d4d60fa230 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 21 Mar 2020 01:55:46 +0100 Subject: [PATCH 101/262] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 57f5c40..e3e07a2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -44,22 +44,22 @@ openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 php7-7.3.15-r0 -php7-common-7.3.15-r0 -php7-ctype-7.3.15-r0 +php7-common-7.3.16-r0 +php7-ctype-7.3.16-r0 php7-fileinfo-7.3.15-r0 php7-fpm-7.3.15-r0 php7-json-7.3.15-r0 php7-mbstring-7.3.15-r0 php7-openssl-7.3.15-r0 -php7-pdo-7.3.15-r0 -php7-pdo_pgsql-7.3.15-r0 -php7-pdo_sqlite-7.3.15-r0 +php7-pdo-7.3.16-r0 +php7-pdo_pgsql-7.3.16-r0 +php7-pdo_sqlite-7.3.16-r0 php7-session-7.3.15-r0 php7-simplexml-7.3.15-r0 -php7-tokenizer-7.3.15-r0 +php7-tokenizer-7.3.16-r0 php7-xml-7.3.15-r0 php7-xmlwriter-7.3.15-r0 -php7-zip-7.3.15-r0 +php7-zip-7.3.16-r0 popt-1.16-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 From 39d4baafab487e2c9d2454c406627f292b37095f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 27 Mar 2020 20:57:18 -0400 Subject: [PATCH 102/262] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e3e07a2..19c039c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -33,7 +33,7 @@ libxml2-2.9.10-r2 libzip-1.5.2-r0 linux-pam-1.3.1-r1 logrotate-3.15.1-r0 -musl-1.1.24-r1 +musl-1.1.24-r2 musl-utils-1.1.24-r1 nano-4.6-r0 ncurses-libs-6.1_p20200118-r2 @@ -43,22 +43,22 @@ nginx-1.16.1-r6 openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 -php7-7.3.15-r0 +php7-7.3.16-r0 php7-common-7.3.16-r0 php7-ctype-7.3.16-r0 -php7-fileinfo-7.3.15-r0 -php7-fpm-7.3.15-r0 -php7-json-7.3.15-r0 -php7-mbstring-7.3.15-r0 -php7-openssl-7.3.15-r0 +php7-fileinfo-7.3.16-r0 +php7-fpm-7.3.16-r0 +php7-json-7.3.16-r0 +php7-mbstring-7.3.16-r0 +php7-openssl-7.3.16-r0 php7-pdo-7.3.16-r0 php7-pdo_pgsql-7.3.16-r0 php7-pdo_sqlite-7.3.16-r0 -php7-session-7.3.15-r0 -php7-simplexml-7.3.15-r0 +php7-session-7.3.16-r0 +php7-simplexml-7.3.16-r0 php7-tokenizer-7.3.16-r0 -php7-xml-7.3.15-r0 -php7-xmlwriter-7.3.15-r0 +php7-xml-7.3.16-r0 +php7-xmlwriter-7.3.16-r0 php7-zip-7.3.16-r0 popt-1.16-r7 readline-8.0.1-r0 From 810e937beb984763a098d49883ef2d49c27b82ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 4 Apr 2020 04:51:11 +0100 Subject: [PATCH 103/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 19c039c..714f9a2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r3 alpine-keys-2.1-r2 apache2-utils-2.4.41-r0 -apk-tools-2.10.4-r3 +apk-tools-2.10.5-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 @@ -34,7 +34,7 @@ libzip-1.5.2-r0 linux-pam-1.3.1-r1 logrotate-3.15.1-r0 musl-1.1.24-r2 -musl-utils-1.1.24-r1 +musl-utils-1.1.24-r2 nano-4.6-r0 ncurses-libs-6.1_p20200118-r2 ncurses-terminfo-base-6.1_p20200118-r2 From f1f25f60d1231a06830daac50dc47dbf28a10404 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 Apr 2020 23:55:16 +0000 Subject: [PATCH 104/262] Bot Updating Templated Files --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2581f49..3be2634 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") -The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :- +The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: * regular and timely application updates * easy user mappings (PGID, PUID) @@ -91,7 +91,7 @@ Compatible with docker-compose v2 schemas. ``` --- -version: "2" +version: "2.1" services: heimdall: image: linuxserver/heimdall @@ -158,6 +158,11 @@ Access the web gui at http://SERVERIP:PORT This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. +## Docker Mods +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27heimdall%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.") + +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. + ## Support Info From f27f1a0f32eaa9d0736f747e2e0c9ade85d0b1d2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 Apr 2020 19:59:00 -0400 Subject: [PATCH 105/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 714f9a2..9af0641 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r3 alpine-keys-2.1-r2 -apache2-utils-2.4.41-r0 +apache2-utils-2.4.43-r0 apk-tools-2.10.5-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 From 9e3b3ab9d0b5b9d5bfeb956063ea5a024395b688 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 17 Apr 2020 19:55:44 -0400 Subject: [PATCH 106/262] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9af0641..3060906 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ coreutils-8.31-r0 curl-7.67.0-r0 db-5.3.28-r1 expat-2.2.9-r1 -git-2.24.1-r0 +git-2.24.2-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r0 @@ -44,22 +44,22 @@ openssl-1.1.1d-r3 pcre-8.43-r0 pcre2-10.34-r1 php7-7.3.16-r0 -php7-common-7.3.16-r0 -php7-ctype-7.3.16-r0 +php7-common-7.3.17-r0 +php7-ctype-7.3.17-r0 php7-fileinfo-7.3.16-r0 php7-fpm-7.3.16-r0 php7-json-7.3.16-r0 php7-mbstring-7.3.16-r0 php7-openssl-7.3.16-r0 -php7-pdo-7.3.16-r0 -php7-pdo_pgsql-7.3.16-r0 -php7-pdo_sqlite-7.3.16-r0 +php7-pdo-7.3.17-r0 +php7-pdo_pgsql-7.3.17-r0 +php7-pdo_sqlite-7.3.17-r0 php7-session-7.3.16-r0 php7-simplexml-7.3.16-r0 -php7-tokenizer-7.3.16-r0 +php7-tokenizer-7.3.17-r0 php7-xml-7.3.16-r0 php7-xmlwriter-7.3.16-r0 -php7-zip-7.3.16-r0 +php7-zip-7.3.17-r0 popt-1.16-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 From ea7872ccc0209c948c75f20d765d49202c70479d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 25 Apr 2020 00:00:10 +0000 Subject: [PATCH 107/262] Bot Updating Package Versions --- package_versions.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3060906..498e514 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,11 +13,11 @@ coreutils-8.31-r0 curl-7.67.0-r0 db-5.3.28-r1 expat-2.2.9-r1 -git-2.24.2-r0 +git-2.24.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r0 -libcrypto1.1-1.1.1d-r3 +libcrypto1.1-1.1.1g-r0 libcurl-7.67.0-r0 libedit-20191211.3.1-r0 libldap-2.4.48-r1 @@ -26,7 +26,7 @@ libpq-12.2-r0 libressl3.0-libcrypto-3.0.2-r0 libressl3.0-libssl-3.0.2-r0 libsasl-2.1.27-r5 -libssl1.1-1.1.1d-r3 +libssl1.1-1.1.1g-r0 libtls-standalone-2.9.1-r0 libuuid-2.34-r1 libxml2-2.9.10-r2 @@ -36,29 +36,29 @@ logrotate-3.15.1-r0 musl-1.1.24-r2 musl-utils-1.1.24-r2 nano-4.6-r0 -ncurses-libs-6.1_p20200118-r2 -ncurses-terminfo-base-6.1_p20200118-r2 +ncurses-libs-6.1_p20200118-r3 +ncurses-terminfo-base-6.1_p20200118-r3 nghttp2-libs-1.40.0-r0 nginx-1.16.1-r6 -openssl-1.1.1d-r3 +openssl-1.1.1g-r0 pcre-8.43-r0 pcre2-10.34-r1 -php7-7.3.16-r0 +php7-7.3.17-r0 php7-common-7.3.17-r0 php7-ctype-7.3.17-r0 -php7-fileinfo-7.3.16-r0 -php7-fpm-7.3.16-r0 -php7-json-7.3.16-r0 -php7-mbstring-7.3.16-r0 -php7-openssl-7.3.16-r0 +php7-fileinfo-7.3.17-r0 +php7-fpm-7.3.17-r0 +php7-json-7.3.17-r0 +php7-mbstring-7.3.17-r0 +php7-openssl-7.3.17-r0 php7-pdo-7.3.17-r0 php7-pdo_pgsql-7.3.17-r0 php7-pdo_sqlite-7.3.17-r0 -php7-session-7.3.16-r0 -php7-simplexml-7.3.16-r0 +php7-session-7.3.17-r0 +php7-simplexml-7.3.17-r0 php7-tokenizer-7.3.17-r0 -php7-xml-7.3.16-r0 -php7-xmlwriter-7.3.16-r0 +php7-xml-7.3.17-r0 +php7-xmlwriter-7.3.17-r0 php7-zip-7.3.17-r0 popt-1.16-r7 readline-8.0.1-r0 From d18d55a9ebb838ef331f23f990be85c28f450ccd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 May 2020 23:54:53 +0000 Subject: [PATCH 108/262] Bot Updating Templated Files --- .github/FUNDING.yml | 1 + Jenkinsfile | 142 ++++++++++++++++++++++++-------------------- 2 files changed, 77 insertions(+), 66 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 7972213..7eaac77 100755 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ +github: linuxserver open_collective: linuxserver diff --git a/Jenkinsfile b/Jenkinsfile index 5b81baa..8dc93c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -357,7 +357,9 @@ pipeline { 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}" + retry(5) { + sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + } sh '''docker rmi \ ${IMAGE}:arm32v7-${META_TAG} \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' @@ -384,7 +386,9 @@ pipeline { 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}" + retry(5) { + sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + } sh '''docker rmi \ ${IMAGE}:arm64v8-${META_TAG} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' @@ -549,18 +553,22 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { + retry(5) { + sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + 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}:latest + docker push ${PUSHIMAGE}:latest + docker push ${PUSHIMAGE}:${META_TAG} + done + ''' + } sh '''#! /bin/bash - set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin - 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}:latest - docker push ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:${META_TAG} - done for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ @@ -591,59 +599,61 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - sh '''#! /bin/bash - set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - 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 - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do - 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-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest - 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}:latest - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:latest - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest - done - ''' + retry(5) { + sh '''#! /bin/bash + set -e + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + if [ "${CI}" == "false" ]; then + docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + 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 + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + 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-latest + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${META_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-latest + docker push ${MANIFESTIMAGE}:arm64v8-latest + docker manifest push --purge ${MANIFESTIMAGE}:latest || : + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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}:latest + 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}:latest + docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} + docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest + docker push ${LEGACYIMAGE}:amd64-${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} + docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} + docker push ${LEGACYIMAGE}:latest + docker push ${LEGACYIMAGE}:${META_TAG} + docker push ${LEGACYIMAGE}:arm32v7-latest + docker push ${LEGACYIMAGE}:arm64v8-latest + done + ''' + } sh '''#! /bin/bash for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ From 4c7af31bc3ffac98d392e7434d6cf8793b1c1dda Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 May 2020 19:57:01 -0400 Subject: [PATCH 109/262] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 498e514..7194b6e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,7 +20,7 @@ libc-utils-0.7.2-r0 libcrypto1.1-1.1.1g-r0 libcurl-7.67.0-r0 libedit-20191211.3.1-r0 -libldap-2.4.48-r1 +libldap-2.4.48-r2 libmagic-5.37-r1 libpq-12.2-r0 libressl3.0-libcrypto-3.0.2-r0 @@ -29,15 +29,15 @@ libsasl-2.1.27-r5 libssl1.1-1.1.1g-r0 libtls-standalone-2.9.1-r0 libuuid-2.34-r1 -libxml2-2.9.10-r2 +libxml2-2.9.10-r3 libzip-1.5.2-r0 linux-pam-1.3.1-r1 logrotate-3.15.1-r0 musl-1.1.24-r2 musl-utils-1.1.24-r2 nano-4.6-r0 -ncurses-libs-6.1_p20200118-r3 -ncurses-terminfo-base-6.1_p20200118-r3 +ncurses-libs-6.1_p20200118-r4 +ncurses-terminfo-base-6.1_p20200118-r4 nghttp2-libs-1.40.0-r0 nginx-1.16.1-r6 openssl-1.1.1g-r0 @@ -64,10 +64,10 @@ popt-1.16-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 shadow-4.7-r1 -sqlite-libs-3.30.1-r1 +sqlite-libs-3.30.1-r2 ssl_client-1.31.1-r9 tar-1.32-r1 -tzdata-2019c-r0 +tzdata-2020a-r0 xz-5.2.4-r0 xz-libs-5.2.4-r0 zlib-1.2.11-r3 From 3e179041f23cd004939e36cf874138fedc88a185 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 May 2020 23:59:05 +0000 Subject: [PATCH 110/262] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7194b6e..3ca6f18 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -44,22 +44,22 @@ openssl-1.1.1g-r0 pcre-8.43-r0 pcre2-10.34-r1 php7-7.3.17-r0 -php7-common-7.3.17-r0 -php7-ctype-7.3.17-r0 +php7-common-7.3.18-r0 +php7-ctype-7.3.18-r0 php7-fileinfo-7.3.17-r0 php7-fpm-7.3.17-r0 php7-json-7.3.17-r0 php7-mbstring-7.3.17-r0 php7-openssl-7.3.17-r0 -php7-pdo-7.3.17-r0 -php7-pdo_pgsql-7.3.17-r0 -php7-pdo_sqlite-7.3.17-r0 +php7-pdo-7.3.18-r0 +php7-pdo_pgsql-7.3.18-r0 +php7-pdo_sqlite-7.3.18-r0 php7-session-7.3.17-r0 php7-simplexml-7.3.17-r0 -php7-tokenizer-7.3.17-r0 +php7-tokenizer-7.3.18-r0 php7-xml-7.3.17-r0 php7-xmlwriter-7.3.17-r0 -php7-zip-7.3.17-r0 +php7-zip-7.3.18-r0 popt-1.16-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 From 066a129894a4573c97bc69bc3397ea63ea9e01a7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 22 May 2020 23:56:00 +0000 Subject: [PATCH 111/262] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3ca6f18..7bc7d73 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,22 +43,22 @@ nginx-1.16.1-r6 openssl-1.1.1g-r0 pcre-8.43-r0 pcre2-10.34-r1 -php7-7.3.17-r0 +php7-7.3.18-r0 php7-common-7.3.18-r0 php7-ctype-7.3.18-r0 -php7-fileinfo-7.3.17-r0 -php7-fpm-7.3.17-r0 -php7-json-7.3.17-r0 -php7-mbstring-7.3.17-r0 -php7-openssl-7.3.17-r0 +php7-fileinfo-7.3.18-r0 +php7-fpm-7.3.18-r0 +php7-json-7.3.18-r0 +php7-mbstring-7.3.18-r0 +php7-openssl-7.3.18-r0 php7-pdo-7.3.18-r0 php7-pdo_pgsql-7.3.18-r0 php7-pdo_sqlite-7.3.18-r0 -php7-session-7.3.17-r0 -php7-simplexml-7.3.17-r0 +php7-session-7.3.18-r0 +php7-simplexml-7.3.18-r0 php7-tokenizer-7.3.18-r0 -php7-xml-7.3.17-r0 -php7-xmlwriter-7.3.17-r0 +php7-xml-7.3.18-r0 +php7-xmlwriter-7.3.18-r0 php7-zip-7.3.18-r0 popt-1.16-r7 readline-8.0.1-r0 From 1fe37c9352dbffc22e96923fcffbfbb952eeb64b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 29 May 2020 19:54:57 -0400 Subject: [PATCH 112/262] Bot Updating Templated Files --- Jenkinsfile | 53 +++++++++++++++++------------------------------------ README.md | 40 ++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8dc93c4..b26e8bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -138,7 +138,6 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -159,7 +158,6 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -180,7 +178,6 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -545,22 +542,15 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:latest @@ -569,7 +559,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:latest || : @@ -591,18 +581,11 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin @@ -636,26 +619,24 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:latest 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}:latest - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:latest - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest - done + docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:amd64-${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker push ${GITHUBIMAGE}:latest + docker push ${GITHUBIMAGE}:${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-latest + docker push ${GITHUBIMAGE}:arm64v8-latest ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ diff --git a/README.md b/README.md index 3be2634..cee2ac4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) -[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") -[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") -[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") -[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") +[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: @@ -25,16 +25,15 @@ Find us at: # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) -[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-heimdall.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-heimdall) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-heimdall/releases) -[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-heimdall/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-heimdall/container_registry) -[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/heimdall) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/heimdall.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/heimdall) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/heimdall) -[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) -[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-heimdall/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-heimdall/container_registry) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) +[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fheimdall%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. @@ -123,7 +122,7 @@ Container images are configured using parameters passed at runtime (such as thos ## Environment variables from files (Docker secrets) -You can set any environment variable from a file by using a special prepend `FILE__`. +You can set any environment variable from a file by using a special prepend `FILE__`. As an example: @@ -133,6 +132,11 @@ As an example: Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +## Umask for running applications + +For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting. +Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support. + ## User / Group Identifiers When using 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`. @@ -159,7 +163,7 @@ This image now supports password protection through htpasswd. Run the following ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27heimdall%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27heimdall%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. From cd40fc146e24a5f8dad178cffe9eeea52881e834 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 29 May 2020 23:57:02 +0000 Subject: [PATCH 113/262] Bot Updating Package Versions --- package_versions.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 7bc7d73..312d357 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,9 +20,11 @@ libc-utils-0.7.2-r0 libcrypto1.1-1.1.1g-r0 libcurl-7.67.0-r0 libedit-20191211.3.1-r0 +libintl-0.20.1-r2 libldap-2.4.48-r2 libmagic-5.37-r1 libpq-12.2-r0 +libproc-3.3.16-r0 libressl3.0-libcrypto-3.0.2-r0 libressl3.0-libssl-3.0.2-r0 libsasl-2.1.27-r5 @@ -61,6 +63,7 @@ php7-xml-7.3.18-r0 php7-xmlwriter-7.3.18-r0 php7-zip-7.3.18-r0 popt-1.16-r7 +procps-3.3.16-r0 readline-8.0.1-r0 scanelf-1.2.4-r0 shadow-4.7-r1 From ea0e2bef9edcf7553115d86cf4d84cb8df7912d5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 1 Jun 2020 12:58:12 -0700 Subject: [PATCH 114/262] Rebasing to Alpine 3.12 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3110f52..deb2c78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:3.11 +FROM lsiobase/nginx:3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7356b2e..632ce2c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm64v8-3.11 +FROM lsiobase/nginx:arm64v8-3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e50af62..84ae437 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm32v7-3.11 +FROM lsiobase/nginx:arm32v7-3.12 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index bcb7d56..bcb6570 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "17.01.20:", desc: "Use nginx from baseimage." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." } From 25f01cf24dba47d2dab454222abbe7d07f72fc64 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 3 Jun 2020 10:26:03 -0400 Subject: [PATCH 115/262] Bot Updating Templated Files --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cee2ac4..7b261d8 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fheimdall%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. @@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **01.06.20:** - Rebasing to alpine 3.12. * **17.01.20:** - Use nginx from baseimage. * **19.12.19:** - Rebasing to alpine 3.11. * **16.07.19:** - Save laravel.log to /config/log/heimdall. From cb77cb7f924c459ce163eae5ab947b1d6429af99 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 3 Jun 2020 16:27:55 +0200 Subject: [PATCH 116/262] Bot Updating Package Versions --- package_versions.txt | 82 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 312d357..5891c36 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,50 +1,50 @@ -alpine-baselayout-3.2.0-r3 -alpine-keys-2.1-r2 +alpine-baselayout-3.2.0-r7 +alpine-keys-2.2-r0 apache2-utils-2.4.43-r0 -apk-tools-2.10.5-r0 +apk-tools-2.10.5-r1 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 -bash-5.0.11-r1 -busybox-1.31.1-r9 -ca-certificates-20191127-r1 -ca-certificates-cacert-20191127-r1 -coreutils-8.31-r0 -curl-7.67.0-r0 +bash-5.0.17-r0 +busybox-1.31.1-r16 +ca-certificates-20191127-r2 +ca-certificates-bundle-20191127-r2 +coreutils-8.32-r0 +curl-7.69.1-r0 db-5.3.28-r1 expat-2.2.9-r1 -git-2.24.3-r0 +git-2.26.2-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 -libc-utils-0.7.2-r0 +libc-utils-0.7.2-r3 libcrypto1.1-1.1.1g-r0 -libcurl-7.67.0-r0 -libedit-20191211.3.1-r0 -libintl-0.20.1-r2 -libldap-2.4.48-r2 -libmagic-5.37-r1 -libpq-12.2-r0 +libcurl-7.69.1-r0 +libedit-20191231.3.1-r0 +libintl-0.20.2-r0 +libldap-2.4.50-r0 +libmagic-5.38-r0 +libpq-12.3-r2 libproc-3.3.16-r0 -libressl3.0-libcrypto-3.0.2-r0 -libressl3.0-libssl-3.0.2-r0 -libsasl-2.1.27-r5 +libressl3.1-libcrypto-3.1.2-r0 +libressl3.1-libssl-3.1.2-r0 +libsasl-2.1.27-r6 libssl1.1-1.1.1g-r0 -libtls-standalone-2.9.1-r0 -libuuid-2.34-r1 -libxml2-2.9.10-r3 -libzip-1.5.2-r0 -linux-pam-1.3.1-r1 -logrotate-3.15.1-r0 -musl-1.1.24-r2 -musl-utils-1.1.24-r2 -nano-4.6-r0 -ncurses-libs-6.1_p20200118-r4 -ncurses-terminfo-base-6.1_p20200118-r4 +libtls-standalone-2.9.1-r1 +libuuid-2.35.2-r0 +libxml2-2.9.10-r4 +libzip-1.6.1-r1 +linux-pam-1.3.1-r4 +logrotate-3.16.0-r0 +musl-1.1.24-r8 +musl-utils-1.1.24-r8 +nano-4.9.3-r0 +ncurses-libs-6.2_p20200523-r0 +ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.40.0-r0 -nginx-1.16.1-r6 +nginx-1.18.0-r0 openssl-1.1.1g-r0 -pcre-8.43-r0 -pcre2-10.34-r1 +pcre-8.44-r0 +pcre2-10.35-r0 php7-7.3.18-r0 php7-common-7.3.18-r0 php7-ctype-7.3.18-r0 @@ -64,13 +64,13 @@ php7-xmlwriter-7.3.18-r0 php7-zip-7.3.18-r0 popt-1.16-r7 procps-3.3.16-r0 -readline-8.0.1-r0 -scanelf-1.2.4-r0 -shadow-4.7-r1 -sqlite-libs-3.30.1-r2 -ssl_client-1.31.1-r9 +readline-8.0.4-r0 +scanelf-1.2.6-r0 +shadow-4.8.1-r0 +sqlite-libs-3.32.1-r0 +ssl_client-1.31.1-r16 tar-1.32-r1 tzdata-2020a-r0 -xz-5.2.4-r0 -xz-libs-5.2.4-r0 +xz-5.2.5-r0 +xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 2552f03f22f0220bf5959d56b784ea1827089bfb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 5 Jun 2020 23:57:06 +0000 Subject: [PATCH 117/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5891c36..9118918 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,8 +7,8 @@ apr-util-1.6.1-r6 argon2-libs-20190702-r1 bash-5.0.17-r0 busybox-1.31.1-r16 -ca-certificates-20191127-r2 -ca-certificates-bundle-20191127-r2 +ca-certificates-20191127-r3 +ca-certificates-bundle-20191127-r3 coreutils-8.32-r0 curl-7.69.1-r0 db-5.3.28-r1 @@ -40,7 +40,7 @@ musl-utils-1.1.24-r8 nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 -nghttp2-libs-1.40.0-r0 +nghttp2-libs-1.41.0-r0 nginx-1.18.0-r0 openssl-1.1.1g-r0 pcre-8.44-r0 From c7ac2f2dbd39776368c3d973f067d4723841c514 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Jun 2020 23:56:12 +0000 Subject: [PATCH 118/262] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9118918..86f244a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,22 +46,22 @@ openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.18-r0 -php7-common-7.3.18-r0 -php7-ctype-7.3.18-r0 +php7-common-7.3.19-r0 +php7-ctype-7.3.19-r0 php7-fileinfo-7.3.18-r0 php7-fpm-7.3.18-r0 php7-json-7.3.18-r0 php7-mbstring-7.3.18-r0 php7-openssl-7.3.18-r0 -php7-pdo-7.3.18-r0 -php7-pdo_pgsql-7.3.18-r0 -php7-pdo_sqlite-7.3.18-r0 +php7-pdo-7.3.19-r0 +php7-pdo_pgsql-7.3.19-r0 +php7-pdo_sqlite-7.3.19-r0 php7-session-7.3.18-r0 php7-simplexml-7.3.18-r0 -php7-tokenizer-7.3.18-r0 +php7-tokenizer-7.3.19-r0 php7-xml-7.3.18-r0 php7-xmlwriter-7.3.18-r0 -php7-zip-7.3.18-r0 +php7-zip-7.3.19-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From 2f792938581c6a3051975aaa09aeb2b686fd4b88 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 19 Jun 2020 23:55:47 +0000 Subject: [PATCH 119/262] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 86f244a..a45c569 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,9 +6,9 @@ apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 bash-5.0.17-r0 -busybox-1.31.1-r16 -ca-certificates-20191127-r3 -ca-certificates-bundle-20191127-r3 +busybox-1.31.1-r19 +ca-certificates-20191127-r4 +ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 curl-7.69.1-r0 db-5.3.28-r1 @@ -45,22 +45,22 @@ nginx-1.18.0-r0 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.18-r0 +php7-7.3.19-r0 php7-common-7.3.19-r0 php7-ctype-7.3.19-r0 -php7-fileinfo-7.3.18-r0 -php7-fpm-7.3.18-r0 -php7-json-7.3.18-r0 -php7-mbstring-7.3.18-r0 -php7-openssl-7.3.18-r0 +php7-fileinfo-7.3.19-r0 +php7-fpm-7.3.19-r0 +php7-json-7.3.19-r0 +php7-mbstring-7.3.19-r0 +php7-openssl-7.3.19-r0 php7-pdo-7.3.19-r0 php7-pdo_pgsql-7.3.19-r0 php7-pdo_sqlite-7.3.19-r0 -php7-session-7.3.18-r0 -php7-simplexml-7.3.18-r0 +php7-session-7.3.19-r0 +php7-simplexml-7.3.19-r0 php7-tokenizer-7.3.19-r0 -php7-xml-7.3.18-r0 -php7-xmlwriter-7.3.18-r0 +php7-xml-7.3.19-r0 +php7-xmlwriter-7.3.19-r0 php7-zip-7.3.19-r0 popt-1.16-r7 procps-3.3.16-r0 @@ -68,7 +68,7 @@ readline-8.0.4-r0 scanelf-1.2.6-r0 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 -ssl_client-1.31.1-r16 +ssl_client-1.31.1-r19 tar-1.32-r1 tzdata-2020a-r0 xz-5.2.5-r0 From 5d9a89615fe03c6e4b9980e0d010924526416de5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 27 Jun 2020 00:57:08 +0100 Subject: [PATCH 120/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a45c569..16c8c26 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,8 +35,8 @@ libxml2-2.9.10-r4 libzip-1.6.1-r1 linux-pam-1.3.1-r4 logrotate-3.16.0-r0 -musl-1.1.24-r8 -musl-utils-1.1.24-r8 +musl-1.1.24-r9 +musl-utils-1.1.24-r9 nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 From e3682d08bcc155da99be1804a7a3f95b675754e2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 17 Jul 2020 19:55:50 -0400 Subject: [PATCH 121/262] Bot Updating Package Versions --- package_versions.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 16c8c26..536bc78 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,23 +45,23 @@ nginx-1.18.0-r0 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.19-r0 -php7-common-7.3.19-r0 -php7-ctype-7.3.19-r0 -php7-fileinfo-7.3.19-r0 -php7-fpm-7.3.19-r0 -php7-json-7.3.19-r0 -php7-mbstring-7.3.19-r0 -php7-openssl-7.3.19-r0 -php7-pdo-7.3.19-r0 -php7-pdo_pgsql-7.3.19-r0 -php7-pdo_sqlite-7.3.19-r0 -php7-session-7.3.19-r0 -php7-simplexml-7.3.19-r0 -php7-tokenizer-7.3.19-r0 -php7-xml-7.3.19-r0 -php7-xmlwriter-7.3.19-r0 -php7-zip-7.3.19-r0 +php7-7.3.20-r0 +php7-common-7.3.20-r0 +php7-ctype-7.3.20-r0 +php7-fileinfo-7.3.20-r0 +php7-fpm-7.3.20-r0 +php7-json-7.3.20-r0 +php7-mbstring-7.3.20-r0 +php7-openssl-7.3.20-r0 +php7-pdo-7.3.20-r0 +php7-pdo_pgsql-7.3.20-r0 +php7-pdo_sqlite-7.3.20-r0 +php7-session-7.3.20-r0 +php7-simplexml-7.3.20-r0 +php7-tokenizer-7.3.20-r0 +php7-xml-7.3.20-r0 +php7-xmlwriter-7.3.20-r0 +php7-zip-7.3.20-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From c3fe331b8c0fa1a554538f165dcca10af92153df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Aug 2020 23:54:50 +0000 Subject: [PATCH 122/262] Bot Updating Templated Files --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b26e8bc..0679799 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { 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 - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -244,7 +244,7 @@ pipeline { cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} @@ -698,6 +698,10 @@ pipeline { ] ]) { 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 lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ @@ -705,7 +709,9 @@ pipeline { -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ - lsiodev/readme-sync bash -c 'node sync' ''' + -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ + lsiodev/readme-sync bash -c 'node sync' + rm -Rf ${TEMPDIR} ''' } } } From 51b2fb0179b42c9a3f376086a1e1ebedb2a8fc82 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Aug 2020 23:56:07 +0000 Subject: [PATCH 123/262] Bot Updating Templated Files --- .github/workflows/greetings.yml | 13 +++++++++++++ .github/workflows/stale.yml | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100755 .github/workflows/greetings.yml create mode 100755 .github/workflows/stale.yml diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml new file mode 100755 index 0000000..f64a011 --- /dev/null +++ b/.github/workflows/greetings.yml @@ -0,0 +1,13 @@ +name: Greetings + +on: [pull_request, issues] + +jobs: + greeting: + runs-on: ubuntu-latest + steps: + - uses: actions/first-interaction@v1 + with: + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-heimdall/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/.github/PULL_REQUEST_TEMPLATE.md)!' + repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100755 index 0000000..1806420 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,23 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: "30 1 * * *" + +jobs: + stale: + + runs-on: ubuntu-latest + + steps: + - uses: actions/stale@v1 + with: + stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + days-before-stale: 30 + days-before-close: 365 + exempt-issue-labels: 'awaiting-approval,work-in-progress' + exempt-pr-labels: 'awaiting-approval,work-in-progress' + repo-token: ${{ secrets.GITHUB_TOKEN }} From 7e5afbabf34ed36a43ad056db85d1d25d6fed83a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Aug 2020 23:58:25 +0000 Subject: [PATCH 124/262] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 536bc78..c2874ca 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,22 +46,22 @@ openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.20-r0 -php7-common-7.3.20-r0 -php7-ctype-7.3.20-r0 +php7-common-7.3.21-r0 +php7-ctype-7.3.21-r0 php7-fileinfo-7.3.20-r0 php7-fpm-7.3.20-r0 php7-json-7.3.20-r0 php7-mbstring-7.3.20-r0 php7-openssl-7.3.20-r0 -php7-pdo-7.3.20-r0 -php7-pdo_pgsql-7.3.20-r0 -php7-pdo_sqlite-7.3.20-r0 +php7-pdo-7.3.21-r0 +php7-pdo_pgsql-7.3.21-r0 +php7-pdo_sqlite-7.3.21-r0 php7-session-7.3.20-r0 php7-simplexml-7.3.20-r0 -php7-tokenizer-7.3.20-r0 +php7-tokenizer-7.3.21-r0 php7-xml-7.3.20-r0 php7-xmlwriter-7.3.20-r0 -php7-zip-7.3.20-r0 +php7-zip-7.3.21-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From d6d4a04dd2cccfca73862744304c1f90e5aeb4b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Aug 2020 23:56:49 +0000 Subject: [PATCH 125/262] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c2874ca..fd2f638 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,22 +45,22 @@ nginx-1.18.0-r0 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.20-r0 +php7-7.3.21-r0 php7-common-7.3.21-r0 php7-ctype-7.3.21-r0 -php7-fileinfo-7.3.20-r0 -php7-fpm-7.3.20-r0 -php7-json-7.3.20-r0 -php7-mbstring-7.3.20-r0 -php7-openssl-7.3.20-r0 +php7-fileinfo-7.3.21-r0 +php7-fpm-7.3.21-r0 +php7-json-7.3.21-r0 +php7-mbstring-7.3.21-r0 +php7-openssl-7.3.21-r0 php7-pdo-7.3.21-r0 php7-pdo_pgsql-7.3.21-r0 php7-pdo_sqlite-7.3.21-r0 -php7-session-7.3.20-r0 -php7-simplexml-7.3.20-r0 +php7-session-7.3.21-r0 +php7-simplexml-7.3.21-r0 php7-tokenizer-7.3.21-r0 -php7-xml-7.3.20-r0 -php7-xmlwriter-7.3.20-r0 +php7-xml-7.3.21-r0 +php7-xmlwriter-7.3.21-r0 php7-zip-7.3.21-r0 popt-1.16-r7 procps-3.3.16-r0 From 30eed8d477d059d037d8f6d1ad032d4e37dc50cb Mon Sep 17 00:00:00 2001 From: divialth <65872926+divialth@users.noreply.github.com> Date: Mon, 17 Aug 2020 12:08:42 +0200 Subject: [PATCH 126/262] added php7-curl --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index deb2c78..755d995 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN \ apk add --no-cache --upgrade \ curl \ php7-ctype \ + php7-curl \ php7-pdo_pgsql \ php7-pdo_sqlite \ php7-tokenizer \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 632ce2c..20189fa 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,6 +15,7 @@ RUN \ apk add --no-cache --upgrade \ curl \ php7-ctype \ + php7-curl \ php7-pdo_pgsql \ php7-pdo_sqlite \ php7-tokenizer \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 84ae437..2e3baa9 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -15,6 +15,7 @@ RUN \ apk add --no-cache --upgrade \ curl \ php7-ctype \ + php7-curl \ php7-pdo_pgsql \ php7-pdo_sqlite \ php7-tokenizer \ From f4aa6bc2fe555effed8b8515420efc914cc5e369 Mon Sep 17 00:00:00 2001 From: divialth <65872926+divialth@users.noreply.github.com> Date: Mon, 17 Aug 2020 16:29:47 +0200 Subject: [PATCH 127/262] Updated Changelog --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index bcb6570..61d7101 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.08.20:", desc: "Add php7-curl." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "17.01.20:", desc: "Use nginx from baseimage." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } From 2ad2df3ade403a8ab61a78a9e7c8b1be8f11bf18 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 17 Aug 2020 14:53:32 +0000 Subject: [PATCH 128/262] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7b261d8..087d8d6 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.08.20:** - Add php7-curl. * **01.06.20:** - Rebasing to alpine 3.12. * **17.01.20:** - Use nginx from baseimage. * **19.12.19:** - Rebasing to alpine 3.11. From e50f2505976aba8449770ace22efeedb64a5858d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 17 Aug 2020 10:55:23 -0400 Subject: [PATCH 129/262] Bot Updating Package Versions --- package_versions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fd2f638..75c1dc6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 -apache2-utils-2.4.43-r0 +apache2-utils-2.4.46-r0 apk-tools-2.10.5-r1 apr-1.7.0-r0 apr-util-1.6.1-r6 @@ -48,6 +48,7 @@ pcre2-10.35-r0 php7-7.3.21-r0 php7-common-7.3.21-r0 php7-ctype-7.3.21-r0 +php7-curl-7.3.21-r0 php7-fileinfo-7.3.21-r0 php7-fpm-7.3.21-r0 php7-json-7.3.21-r0 From 962367e3005f32571445d73713f77096ad9d2f27 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 21 Aug 2020 19:54:56 -0400 Subject: [PATCH 130/262] Bot Updating Templated Files --- .github/workflows/greetings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index f64a011..bae8fb4 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -1,6 +1,6 @@ name: Greetings -on: [pull_request, issues] +on: [pull_request_target, issues] jobs: greeting: From bf5138f275eec90adbfc32e5a3c8518946b1820c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Sep 2020 23:56:15 +0000 Subject: [PATCH 131/262] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 75c1dc6..56e1731 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,23 +46,23 @@ openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.21-r0 -php7-common-7.3.21-r0 -php7-ctype-7.3.21-r0 -php7-curl-7.3.21-r0 +php7-common-7.3.22-r0 +php7-ctype-7.3.22-r0 +php7-curl-7.3.22-r0 php7-fileinfo-7.3.21-r0 php7-fpm-7.3.21-r0 php7-json-7.3.21-r0 php7-mbstring-7.3.21-r0 php7-openssl-7.3.21-r0 -php7-pdo-7.3.21-r0 -php7-pdo_pgsql-7.3.21-r0 -php7-pdo_sqlite-7.3.21-r0 +php7-pdo-7.3.22-r0 +php7-pdo_pgsql-7.3.22-r0 +php7-pdo_sqlite-7.3.22-r0 php7-session-7.3.21-r0 php7-simplexml-7.3.21-r0 -php7-tokenizer-7.3.21-r0 +php7-tokenizer-7.3.22-r0 php7-xml-7.3.21-r0 php7-xmlwriter-7.3.21-r0 -php7-zip-7.3.21-r0 +php7-zip-7.3.22-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From 51c1b6e2c226bdaf478630c46a0bf92b5ad814c2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Sep 2020 00:56:37 +0100 Subject: [PATCH 132/262] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 56e1731..37a7c91 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r0 libmagic-5.38-r0 -libpq-12.3-r2 +libpq-12.4-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 @@ -45,23 +45,23 @@ nginx-1.18.0-r0 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.21-r0 +php7-7.3.22-r0 php7-common-7.3.22-r0 php7-ctype-7.3.22-r0 php7-curl-7.3.22-r0 -php7-fileinfo-7.3.21-r0 -php7-fpm-7.3.21-r0 -php7-json-7.3.21-r0 -php7-mbstring-7.3.21-r0 -php7-openssl-7.3.21-r0 +php7-fileinfo-7.3.22-r0 +php7-fpm-7.3.22-r0 +php7-json-7.3.22-r0 +php7-mbstring-7.3.22-r0 +php7-openssl-7.3.22-r0 php7-pdo-7.3.22-r0 php7-pdo_pgsql-7.3.22-r0 php7-pdo_sqlite-7.3.22-r0 -php7-session-7.3.21-r0 -php7-simplexml-7.3.21-r0 +php7-session-7.3.22-r0 +php7-simplexml-7.3.22-r0 php7-tokenizer-7.3.22-r0 -php7-xml-7.3.21-r0 -php7-xmlwriter-7.3.21-r0 +php7-xml-7.3.22-r0 +php7-xmlwriter-7.3.22-r0 php7-zip-7.3.22-r0 popt-1.16-r7 procps-3.3.16-r0 From b7e314c74fdb6e3e373083f962960b9b7b761f32 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Sep 2020 23:56:40 +0000 Subject: [PATCH 133/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 37a7c91..e42736d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ busybox-1.31.1-r19 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.69.1-r0 +curl-7.69.1-r1 db-5.3.28-r1 expat-2.2.9-r1 git-2.26.2-r0 @@ -18,7 +18,7 @@ libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r0 +libcurl-7.69.1-r1 libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r0 From 03900b83f55a51828bfa6e84dd0998bf89c6ac8f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 26 Sep 2020 00:00:13 +0000 Subject: [PATCH 134/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e42736d..f4288d5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,7 +31,7 @@ libsasl-2.1.27-r6 libssl1.1-1.1.1g-r0 libtls-standalone-2.9.1-r1 libuuid-2.35.2-r0 -libxml2-2.9.10-r4 +libxml2-2.9.10-r5 libzip-1.6.1-r1 linux-pam-1.3.1-r4 logrotate-3.16.0-r0 From c80ca25b190690397b19cd4fa34490845b91d3f1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Oct 2020 00:55:05 +0100 Subject: [PATCH 135/262] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 12 ++++-- .github/PULL_REQUEST_TEMPLATE.md | 10 +++-- .github/workflows/greetings.yml | 4 +- Jenkinsfile | 28 ++++++++++++- README.md | 68 +++++++++++++++++--------------- 5 files changed, 79 insertions(+), 43 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 33210db..883a422 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,10 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] -If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. + + + + @@ -22,9 +25,10 @@ If you are new to Docker or this application our issue tracker is **ONLY** used 4. ## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + ## Command used to create docker container (run/create/compose/screenshot) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 26d5031..ee5cdee 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,11 +2,11 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - + - + @@ -21,7 +21,11 @@ ------------------------------ -We welcome all PR’s though this doesn’t guarantee it will be accepted. + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-heimdall/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + +------------------------------ + + ## Description: diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index bae8fb4..84ee7fb 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-heimdall/.github/ISSUE_TEMPLATE.md)!' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/.github/PULL_REQUEST_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-heimdall/blob/master/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Jenkinsfile b/Jenkinsfile index 0679799..080d5b1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { 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 - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -146,6 +146,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } } } @@ -166,6 +167,7 @@ pipeline { 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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' } } @@ -186,6 +188,7 @@ pipeline { 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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN 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/' } @@ -553,8 +556,10 @@ pipeline { for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} + docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} done ''' } @@ -562,6 +567,7 @@ pipeline { for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:latest || : done ''' @@ -602,12 +608,18 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-latest docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -616,8 +628,12 @@ pipeline { 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 create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} @@ -626,6 +642,10 @@ pipeline { docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${GITHUBIMAGE}:amd64-${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} @@ -633,6 +653,10 @@ pipeline { docker push ${GITHUBIMAGE}:${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-latest docker push ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -701,7 +725,7 @@ pipeline { 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 run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ diff --git a/README.md b/README.md index 087d8d6..8922213 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + + + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") @@ -68,27 +71,11 @@ This image provides various versions that are available via tags. `latest` tag u Here are some example snippets to help you get started creating a container. -### docker - -``` -docker create \ - --name=heimdall \ - -e PUID=1000 \ - -e PGID=1000 \ - -e TZ=Europe/London \ - -p 80:80 \ - -p 443:443 \ - -v :/config \ - --restart unless-stopped \ - linuxserver/heimdall -``` - - -### docker-compose +### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) Compatible with docker-compose v2 schemas. -``` +```yaml --- version: "2.1" services: @@ -107,6 +94,22 @@ services: restart: unless-stopped ``` +### docker cli + +``` +docker run -d \ + --name=heimdall \ + -e PUID=1000 \ + -e PGID=1000 \ + -e TZ=Europe/London \ + -p 80:80 \ + -p 443:443 \ + -v :/config \ + --restart unless-stopped \ + linuxserver/heimdall +``` + + ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -163,9 +166,9 @@ This image now supports password protection through htpasswd. Run the following ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27heimdall%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=heimdall&query=%24.mods%5B%27heimdall%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") -We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. ## Support Info @@ -183,14 +186,6 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: -### Via Docker Run/Create -* Update the image: `docker pull linuxserver/heimdall` -* Stop the running container: `docker stop heimdall` -* Delete the container: `docker rm heimdall` -* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* Start the new container: `docker start 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` @@ -198,7 +193,14 @@ 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) +### Via Docker Run +* Update the image: `docker pull linuxserver/heimdall` +* Stop the running container: `docker stop heimdall` +* Delete the container: `docker rm heimdall` +* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) +* You can also remove the old dangling images: `docker image prune` + +### Via Watchtower auto-updater (only use 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 \ @@ -206,11 +208,13 @@ Below are the instructions for updating containers: containrrr/watchtower \ --run-once heimdall ``` - -**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose. - * You can also remove the old dangling images: `docker image prune` +**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). + +### Image Update Notifications - Diun (Docker Image Update Notifier) +* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. + ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: From 6d5c55c186c087a87dbbd28624dc84b0f70702a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Oct 2020 00:56:09 +0100 Subject: [PATCH 136/262] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 122 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100755 .github/CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100755 index 0000000..abc46f3 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,122 @@ +# Contributing to heimdall + +## Gotchas + +* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. +* Read, and fill the Pull Request template + * If this is a fix for a typo in code or documentation in the README please file an issue + * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) + +## Common files + +| File | Use case | +| :----: | --- | +| `Dockerfile` | Dockerfile used to build amd64 images | +| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures | +| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures | +| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image | +| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process | +| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions | +| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries | +| `readme-vars.yml` | This file is used to generate the `README.md` | + +## Readme + +If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/master/readme-vars.yml). + +These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. +Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-heimdall) + +### Fixing typos or clarify the text in the readme + +There are variables for multiple parts of the readme, the most common ones are: + +| Variable | Description | +| :----: | --- | +| `project_blurb` | This is the short excerpt shown above the project logo. | +| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled | + +### Parameters + +The compose and run examples are also generated from these variables. + +We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder. + +These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`. +Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file. + +Devices, environment variables, ports and volumes expects its variables in a certain way. + +### Devices + +```yml +param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +opt_param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +``` + +### Environment variables + +```yml +param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } +opt_param_env_vars: + - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." } +``` + +### Ports + +```yml +param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +opt_param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +``` + +### Volumes + +```yml +param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +opt_param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +``` + +### Testing template changes + +After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR. + +## Dockerfiles + +We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work. +If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order. + +### Testing your changes + +``` +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`. + +## Update the chagelog + +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/master/root), add an entry to the changelog + +```yml +changelogs: + - { date: "DD.MM.YY:", desc: "Added some love to templates" } +``` From d4240f471e43dfb52441c34ab1ced14dd412d72d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Oct 2020 23:58:37 +0000 Subject: [PATCH 137/262] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f4288d5..16426c9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,23 +46,23 @@ openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.22-r0 -php7-common-7.3.22-r0 -php7-ctype-7.3.22-r0 -php7-curl-7.3.22-r0 +php7-common-7.3.23-r0 +php7-ctype-7.3.23-r0 +php7-curl-7.3.23-r0 php7-fileinfo-7.3.22-r0 php7-fpm-7.3.22-r0 php7-json-7.3.22-r0 php7-mbstring-7.3.22-r0 php7-openssl-7.3.22-r0 -php7-pdo-7.3.22-r0 -php7-pdo_pgsql-7.3.22-r0 -php7-pdo_sqlite-7.3.22-r0 +php7-pdo-7.3.23-r0 +php7-pdo_pgsql-7.3.23-r0 +php7-pdo_sqlite-7.3.23-r0 php7-session-7.3.22-r0 php7-simplexml-7.3.22-r0 -php7-tokenizer-7.3.22-r0 +php7-tokenizer-7.3.23-r0 php7-xml-7.3.22-r0 php7-xmlwriter-7.3.22-r0 -php7-zip-7.3.22-r0 +php7-zip-7.3.23-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From 50cac6bd7cd397104daff721d30c9a17a067ed2b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 9 Oct 2020 23:56:22 +0000 Subject: [PATCH 138/262] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 16426c9..2bd5f55 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,23 +45,23 @@ nginx-1.18.0-r0 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.22-r0 +php7-7.3.23-r0 php7-common-7.3.23-r0 php7-ctype-7.3.23-r0 php7-curl-7.3.23-r0 -php7-fileinfo-7.3.22-r0 -php7-fpm-7.3.22-r0 -php7-json-7.3.22-r0 -php7-mbstring-7.3.22-r0 -php7-openssl-7.3.22-r0 +php7-fileinfo-7.3.23-r0 +php7-fpm-7.3.23-r0 +php7-json-7.3.23-r0 +php7-mbstring-7.3.23-r0 +php7-openssl-7.3.23-r0 php7-pdo-7.3.23-r0 php7-pdo_pgsql-7.3.23-r0 php7-pdo_sqlite-7.3.23-r0 -php7-session-7.3.22-r0 -php7-simplexml-7.3.22-r0 +php7-session-7.3.23-r0 +php7-simplexml-7.3.23-r0 php7-tokenizer-7.3.23-r0 -php7-xml-7.3.22-r0 -php7-xmlwriter-7.3.22-r0 +php7-xml-7.3.23-r0 +php7-xmlwriter-7.3.23-r0 php7-zip-7.3.23-r0 popt-1.16-r7 procps-3.3.16-r0 From 7c90bb4f8204f4b0ce9c1f41a43d5dff2f606dc4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 31 Oct 2020 01:00:56 +0000 Subject: [PATCH 139/262] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2bd5f55..96f3e36 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,28 +41,28 @@ nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r0 +nginx-1.18.0-r1 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.23-r0 -php7-common-7.3.23-r0 -php7-ctype-7.3.23-r0 -php7-curl-7.3.23-r0 +php7-common-7.3.24-r0 +php7-ctype-7.3.24-r0 +php7-curl-7.3.24-r0 php7-fileinfo-7.3.23-r0 php7-fpm-7.3.23-r0 php7-json-7.3.23-r0 php7-mbstring-7.3.23-r0 php7-openssl-7.3.23-r0 -php7-pdo-7.3.23-r0 -php7-pdo_pgsql-7.3.23-r0 -php7-pdo_sqlite-7.3.23-r0 +php7-pdo-7.3.24-r0 +php7-pdo_pgsql-7.3.24-r0 +php7-pdo_sqlite-7.3.24-r0 php7-session-7.3.23-r0 php7-simplexml-7.3.23-r0 -php7-tokenizer-7.3.23-r0 +php7-tokenizer-7.3.24-r0 php7-xml-7.3.23-r0 php7-xmlwriter-7.3.23-r0 -php7-zip-7.3.23-r0 +php7-zip-7.3.24-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From e57e35b4dd9805527e1c5c7d5209635af12e1ad4 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 2 Nov 2020 06:38:11 -0800 Subject: [PATCH 140/262] update baseimages --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 755d995..1baf261 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 20189fa..7c0cb24 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2e3baa9..02f2a1b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12 # set version label ARG BUILD_DATE From 287389fcc47e66013cb367e9dda553e1920f4b0a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 09:39:23 -0500 Subject: [PATCH 141/262] Bot Updating Templated Files --- Jenkinsfile | 162 ++++++++++++++++++++-------------------------------- README.md | 14 ++--- 2 files changed, 68 insertions(+), 108 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 080d5b1..fc3363f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,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}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm ghcr.io/linuxserver/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' ''', @@ -138,7 +138,7 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER @@ -159,7 +159,7 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + 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 @@ -180,7 +180,7 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + 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 @@ -201,24 +201,24 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET') ]) { script{ - env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' + env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash set -e - docker pull lsiodev/spaces-file-upload:latest + docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ -e FILE_NAME="shellcheck-result.xml" \ -e MIMETYPE="text/xml" \ -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ - -t lsiodev/spaces-file-upload:latest \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ + -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ python /upload.py''' } } @@ -236,8 +236,8 @@ pipeline { 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 ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/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) @@ -342,28 +342,19 @@ pipeline { 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 "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}" - retry(5) { - sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + 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} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm32v7-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } stage('Build ARM64') { @@ -371,28 +362,19 @@ pipeline { 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 "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}" - retry(5) { - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + 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} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm64v8-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -491,20 +473,20 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET') ]) { script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' } sh '''#! /bin/bash set -e - docker pull lsiodev/ci:latest + docker pull ghcr.io/linuxserver/lsiodev-ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - 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} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ --shm-size=1gb \ @@ -516,15 +498,15 @@ pipeline { -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_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 \ + -t ghcr.io/linuxserver/lsiodev-ci:latest \ python /ci/ci.py''' } } @@ -551,7 +533,7 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} @@ -593,15 +575,15 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - 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} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do 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} @@ -635,28 +617,6 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done - docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker push ${GITHUBIMAGE}:latest - docker push ${GITHUBIMAGE}:${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-latest - docker push ${GITHUBIMAGE}:arm64v8-latest - docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -670,8 +630,8 @@ pipeline { ${DELETEIMAGE}:arm64v8-latest || : done docker rmi \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : ''' } } @@ -724,9 +684,9 @@ pipeline { 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="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest - docker pull lsiodev/readme-sync + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker pull ghcr.io/linuxserver/lsiodev-readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -734,7 +694,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - lsiodev/readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index 8922213..9ac0e2b 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/heimdall/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/heimdall/latest/index.html) [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. @@ -48,7 +48,7 @@ Why not use it as your browser start page? It even has the ability to include a 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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `ghcr.io/linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -80,7 +80,7 @@ Compatible with docker-compose v2 schemas. version: "2.1" services: heimdall: - image: linuxserver/heimdall + image: ghcr.io/linuxserver/heimdall container_name: heimdall environment: - PUID=1000 @@ -106,7 +106,7 @@ docker run -d \ -p 443:443 \ -v :/config \ --restart unless-stopped \ - linuxserver/heimdall + ghcr.io/linuxserver/heimdall ``` @@ -178,7 +178,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/heimdall` ## Updating Info @@ -194,7 +194,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run -* Update the image: `docker pull linuxserver/heimdall` +* Update the image: `docker pull ghcr.io/linuxserver/heimdall` * Stop the running container: `docker stop heimdall` * Delete the container: `docker rm heimdall` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -224,7 +224,7 @@ cd docker-heimdall docker build \ --no-cache \ --pull \ - -t linuxserver/heimdall:latest . + -t ghcr.io/linuxserver/heimdall:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From b2503d31a7ea13836001d52a791d69dd1405aeb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 09:41:35 -0500 Subject: [PATCH 142/262] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 96f3e36..6aef58a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,23 +45,23 @@ nginx-1.18.0-r1 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.23-r0 +php7-7.3.24-r0 php7-common-7.3.24-r0 php7-ctype-7.3.24-r0 php7-curl-7.3.24-r0 -php7-fileinfo-7.3.23-r0 -php7-fpm-7.3.23-r0 -php7-json-7.3.23-r0 -php7-mbstring-7.3.23-r0 -php7-openssl-7.3.23-r0 +php7-fileinfo-7.3.24-r0 +php7-fpm-7.3.24-r0 +php7-json-7.3.24-r0 +php7-mbstring-7.3.24-r0 +php7-openssl-7.3.24-r0 php7-pdo-7.3.24-r0 php7-pdo_pgsql-7.3.24-r0 php7-pdo_sqlite-7.3.24-r0 -php7-session-7.3.23-r0 -php7-simplexml-7.3.23-r0 +php7-session-7.3.24-r0 +php7-simplexml-7.3.24-r0 php7-tokenizer-7.3.24-r0 -php7-xml-7.3.23-r0 -php7-xmlwriter-7.3.23-r0 +php7-xml-7.3.24-r0 +php7-xmlwriter-7.3.24-r0 php7-zip-7.3.24-r0 popt-1.16-r7 procps-3.3.16-r0 @@ -71,7 +71,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tar-1.32-r1 -tzdata-2020a-r0 +tzdata-2020c-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 68fa8d66f06c00dca32db12af0077fd209345ba8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 21 Nov 2020 00:56:28 +0000 Subject: [PATCH 143/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6aef58a..0045363 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,7 +35,7 @@ libxml2-2.9.10-r5 libzip-1.6.1-r1 linux-pam-1.3.1-r4 logrotate-3.16.0-r0 -musl-1.1.24-r9 +musl-1.1.24-r10 musl-utils-1.1.24-r9 nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 From e37340426c22f07c214016f3cd298dcf33011629 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 28 Nov 2020 00:56:43 +0000 Subject: [PATCH 144/262] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0045363..43fa390 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r0 libmagic-5.38-r0 -libpq-12.4-r0 +libpq-12.5-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 @@ -46,23 +46,23 @@ openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.24-r0 -php7-common-7.3.24-r0 -php7-ctype-7.3.24-r0 -php7-curl-7.3.24-r0 +php7-common-7.3.25-r0 +php7-ctype-7.3.25-r0 +php7-curl-7.3.25-r0 php7-fileinfo-7.3.24-r0 php7-fpm-7.3.24-r0 php7-json-7.3.24-r0 php7-mbstring-7.3.24-r0 php7-openssl-7.3.24-r0 -php7-pdo-7.3.24-r0 -php7-pdo_pgsql-7.3.24-r0 -php7-pdo_sqlite-7.3.24-r0 +php7-pdo-7.3.25-r0 +php7-pdo_pgsql-7.3.25-r0 +php7-pdo_sqlite-7.3.25-r0 php7-session-7.3.24-r0 php7-simplexml-7.3.24-r0 -php7-tokenizer-7.3.24-r0 +php7-tokenizer-7.3.25-r0 php7-xml-7.3.24-r0 php7-xmlwriter-7.3.24-r0 -php7-zip-7.3.24-r0 +php7-zip-7.3.25-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From 1355170ccc7d1ba281de6d46c72b8d606d489bf9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Dec 2020 00:57:26 +0000 Subject: [PATCH 145/262] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 43fa390..59db1e6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -36,7 +36,7 @@ libzip-1.6.1-r1 linux-pam-1.3.1-r4 logrotate-3.16.0-r0 musl-1.1.24-r10 -musl-utils-1.1.24-r9 +musl-utils-1.1.24-r10 nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 @@ -45,23 +45,23 @@ nginx-1.18.0-r1 openssl-1.1.1g-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.24-r0 +php7-7.3.25-r0 php7-common-7.3.25-r0 php7-ctype-7.3.25-r0 php7-curl-7.3.25-r0 -php7-fileinfo-7.3.24-r0 -php7-fpm-7.3.24-r0 -php7-json-7.3.24-r0 -php7-mbstring-7.3.24-r0 -php7-openssl-7.3.24-r0 +php7-fileinfo-7.3.25-r0 +php7-fpm-7.3.25-r0 +php7-json-7.3.25-r0 +php7-mbstring-7.3.25-r0 +php7-openssl-7.3.25-r0 php7-pdo-7.3.25-r0 php7-pdo_pgsql-7.3.25-r0 php7-pdo_sqlite-7.3.25-r0 -php7-session-7.3.24-r0 -php7-simplexml-7.3.24-r0 +php7-session-7.3.25-r0 +php7-simplexml-7.3.25-r0 php7-tokenizer-7.3.25-r0 -php7-xml-7.3.24-r0 -php7-xmlwriter-7.3.24-r0 +php7-xml-7.3.25-r0 +php7-xmlwriter-7.3.25-r0 php7-zip-7.3.25-r0 popt-1.16-r7 procps-3.3.16-r0 @@ -71,7 +71,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tar-1.32-r1 -tzdata-2020c-r0 +tzdata-2020c-r1 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From ca3f65b1f86340cf590d6fee6cf8ad4e26797f5d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Dec 2020 00:57:42 +0000 Subject: [PATCH 146/262] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 59db1e6..589a12c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 -apache2-utils-2.4.46-r0 +apache2-utils-2.4.46-r1 apk-tools-2.10.5-r1 apr-1.7.0-r0 apr-util-1.6.1-r6 @@ -10,25 +10,25 @@ busybox-1.31.1-r19 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.69.1-r1 +curl-7.69.1-r3 db-5.3.28-r1 expat-2.2.9-r1 git-2.26.2-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r1 +libcrypto1.1-1.1.1i-r0 +libcurl-7.69.1-r3 libedit-20191231.3.1-r0 libintl-0.20.2-r0 -libldap-2.4.50-r0 +libldap-2.4.50-r1 libmagic-5.38-r0 libpq-12.5-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 -libssl1.1-1.1.1g-r0 +libssl1.1-1.1.1i-r0 libtls-standalone-2.9.1-r1 libuuid-2.35.2-r0 libxml2-2.9.10-r5 From f2f1aa519c841687e7e41da58fbdf89415efccf2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 12 Dec 2020 09:12:53 -0500 Subject: [PATCH 147/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 589a12c..4f23bb1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -42,7 +42,7 @@ ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r1 -openssl-1.1.1g-r0 +openssl-1.1.1i-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.25-r0 From a29a6ff33b596f576238b641ba2cbb0ec0e7784e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Dec 2020 17:09:27 +0000 Subject: [PATCH 148/262] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 ------------------------------- Jenkinsfile | 46 +++++++++++++++++++++++++++++++-------- README.md | 2 +- 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 883a422..8b13789 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,38 +1 @@ -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/Jenkinsfile b/Jenkinsfile index fc3363f..8af9df6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { 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 - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -145,6 +145,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } @@ -166,6 +167,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } + env.VERSION_TAG = 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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' @@ -187,6 +189,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } + env.VERSION_TAG = 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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST @@ -248,9 +251,12 @@ pipeline { git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} + git rm .github/ISSUE_TEMPLATE.md || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -320,8 +326,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -333,8 +340,9 @@ pipeline { parallel { stage('Build X86') { steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -342,12 +350,13 @@ pipeline { label 'ARMHF' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' 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} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -362,12 +371,13 @@ pipeline { label 'ARM64' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' 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} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -440,6 +450,13 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + sh '''#! /bin/bash + echo "Packages were updated. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -457,6 +474,13 @@ pipeline { } } steps { + sh '''#! /bin/bash + echo "There are no package updates. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -546,7 +570,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ @@ -610,6 +634,7 @@ pipeline { 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}:${EXT_RELEASE_TAG} || : docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 @@ -624,10 +649,13 @@ pipeline { docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest || : + ${DELETEIMAGE}:arm64v8-latest \ + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -694,7 +722,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index 9ac0e2b..fdd13db 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Find us at: [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-heimdall/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-heimdall/container_registry) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-heimdall/container_registry) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) From c8d11a59e2cf2b527a1b6e8064ec2dc9d91ac26e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Dec 2020 12:10:42 -0500 Subject: [PATCH 149/262] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 1 - .github/ISSUE_TEMPLATE/config.yml | 13 +++ .github/ISSUE_TEMPLATE/issue.bug.md | 40 ++++++++ .github/ISSUE_TEMPLATE/issue.feature.md | 25 +++++ .github/workflows/external_trigger.yml | 91 +++++++++++++++++++ .../workflows/external_trigger_scheduler.yml | 43 +++++++++ .github/workflows/package_trigger.yml | 38 ++++++++ .../workflows/package_trigger_scheduler.yml | 50 ++++++++++ 8 files changed, 300 insertions(+), 1 deletion(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100755 .github/ISSUE_TEMPLATE/config.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md create mode 100755 .github/workflows/external_trigger.yml create mode 100755 .github/workflows/external_trigger_scheduler.yml create mode 100755 .github/workflows/package_trigger.yml create mode 100755 .github/workflows/package_trigger_scheduler.yml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 8b13789..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100755 index 0000000..ad4439f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,13 @@ +blank_issues_enabled: false +contact_links: + - name: Discord chat support + url: https://discord.gg/YWrKVTn + about: Realtime support / chat with the community and the team. + + - name: Discourse discussion forum + url: https://discourse.linuxserver.io + about: Post on our community forum. + + - name: Documentation + url: https://docs.linuxserver.io/images/docker-heimdall + about: Documentation - information about all of our containers. diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md new file mode 100755 index 0000000..a22ea60 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.md @@ -0,0 +1,40 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + +------------------------------ + +## Expected Behavior + + +## Current Behavior + + +## Steps to Reproduce + + +1. +2. +3. +4. + +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md new file mode 100755 index 0000000..20a91fd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.md @@ -0,0 +1,25 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + + + + +------------------------------ + +## Desired Behavior + + +## Current Behavior + + +## Alternatives Considered + diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml new file mode 100755 index 0000000..84e9cf6 --- /dev/null +++ b/.github/workflows/external_trigger.yml @@ -0,0 +1,91 @@ +name: External Trigger Main + +on: + workflow_dispatch: + +jobs: + external-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: External Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER }}" ]; then + echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****" + exit 0 + fi + echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\". ****" + echo "**** Retrieving external version ****" + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" | jq -r '. | .tag_name') + if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then + echo "**** Can't retrieve external version, exiting ****" + FAILURE_REASON="Can't retrieve external version for heimdall branch master" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') + echo "**** External version: ${EXT_RELEASE} ****" + echo "**** Retrieving last pushed version ****" + image="linuxserver/heimdall" + tag="latest" + token=$(curl -sX GET \ + "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fheimdall%3Apull" \ + | jq -r '.token') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}" \ + | jq -r 'first(.manifests[].digest)') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') + image_info=$(curl -sL \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/blobs/${digest}" \ + | jq -r '.container_config') + IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') + IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') + if [ -z "${IMAGE_VERSION}" ]; then + echo "**** Can't retrieve last pushed version, exiting ****" + FAILURE_REASON="Can't retrieve last pushed version for heimdall tag latest" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** Last pushed version: ${IMAGE_VERSION} ****" + if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then + echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + exit 0 + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + exit 0 + else + echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + echo "**** Notifying Discord ****" + TRIGGER_REASON="A version change was detected for heimdall tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml new file mode 100755 index 0000000..1120455 --- /dev/null +++ b/.github/workflows/external_trigger_scheduler.yml @@ -0,0 +1,43 @@ +name: External Trigger Scheduler + +on: + schedule: + - cron: '35 * * * *' + workflow_dispatch: + +jobs: + external-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: External Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "$br" == "$ls_branch" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/external_trigger.yml/dispatches + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml new file mode 100755 index 0000000..528be13 --- /dev/null +++ b/.github/workflows/package_trigger.yml @@ -0,0 +1,38 @@ +name: Package Trigger Main + +on: + workflow_dispatch: + +jobs: + package-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Package Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****" + exit 0 + fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + exit 0 + fi + echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\". ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml new file mode 100755 index 0000000..f06bcea --- /dev/null +++ b/.github/workflows/package_trigger_scheduler.yml @@ -0,0 +1,50 @@ +name: Package Trigger Scheduler + +on: + schedule: + - cron: '53 5 * * 5' + workflow_dispatch: + +jobs: + package-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: Package Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "${br}" == "${ls_branch}" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + triggered_branches="${triggered_branches}${br} " + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/package_trigger.yml/dispatches + sleep 30 + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for heimdall** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-heimdall/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} From c748e89cc7fee61236f2a2150f42e183072b9928 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 Jan 2021 06:16:28 +0000 Subject: [PATCH 150/262] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4f23bb1..3078021 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,23 +46,23 @@ openssl-1.1.1i-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.25-r0 -php7-common-7.3.25-r0 -php7-ctype-7.3.25-r0 -php7-curl-7.3.25-r0 +php7-common-7.3.26-r0 +php7-ctype-7.3.26-r0 +php7-curl-7.3.26-r0 php7-fileinfo-7.3.25-r0 php7-fpm-7.3.25-r0 php7-json-7.3.25-r0 php7-mbstring-7.3.25-r0 php7-openssl-7.3.25-r0 -php7-pdo-7.3.25-r0 -php7-pdo_pgsql-7.3.25-r0 -php7-pdo_sqlite-7.3.25-r0 +php7-pdo-7.3.26-r0 +php7-pdo_pgsql-7.3.26-r0 +php7-pdo_sqlite-7.3.26-r0 php7-session-7.3.25-r0 php7-simplexml-7.3.25-r0 -php7-tokenizer-7.3.25-r0 +php7-tokenizer-7.3.26-r0 php7-xml-7.3.25-r0 php7-xmlwriter-7.3.25-r0 -php7-zip-7.3.25-r0 +php7-zip-7.3.26-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From 05905409de343a4e2737ece7a9656705bc139bac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 Jan 2021 06:22:53 +0000 Subject: [PATCH 151/262] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 3 ++- .github/workflows/greetings.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- Jenkinsfile | 19 ++++++++++++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 84e9cf6..ff60506 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -22,8 +22,9 @@ jobs: if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for heimdall branch master" + GHA_TRIGGER_URL="https://github.com/linuxserver/docker-heimdall/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, - "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 84ee7fb..54c9a1c 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-heimdall/blob/master/.github/ISSUE_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-heimdall/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-heimdall/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index f06bcea..f37a8cf 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '53 5 * * 5' + - cron: '54 7 * * 0' workflow_dispatch: jobs: diff --git a/Jenkinsfile b/Jenkinsfile index 8af9df6..b7ff8fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -265,13 +265,30 @@ 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}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -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}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + fi + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, skipping Unraid template upload" + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cd ${TEMPDIR}/unraid/templates/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all + fi + fi rm -Rf ${TEMPDIR}''' script{ env.FILES_UPDATED = sh( From 363f47eb2ffb028afb6116a9c21421728d9f6760 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 Jan 2021 06:31:55 +0000 Subject: [PATCH 152/262] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3078021..c24e013 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,23 +45,23 @@ nginx-1.18.0-r1 openssl-1.1.1i-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.25-r0 +php7-7.3.26-r0 php7-common-7.3.26-r0 php7-ctype-7.3.26-r0 php7-curl-7.3.26-r0 -php7-fileinfo-7.3.25-r0 -php7-fpm-7.3.25-r0 -php7-json-7.3.25-r0 -php7-mbstring-7.3.25-r0 -php7-openssl-7.3.25-r0 +php7-fileinfo-7.3.26-r0 +php7-fpm-7.3.26-r0 +php7-json-7.3.26-r0 +php7-mbstring-7.3.26-r0 +php7-openssl-7.3.26-r0 php7-pdo-7.3.26-r0 php7-pdo_pgsql-7.3.26-r0 php7-pdo_sqlite-7.3.26-r0 -php7-session-7.3.25-r0 -php7-simplexml-7.3.25-r0 +php7-session-7.3.26-r0 +php7-simplexml-7.3.26-r0 php7-tokenizer-7.3.26-r0 -php7-xml-7.3.25-r0 -php7-xmlwriter-7.3.25-r0 +php7-xml-7.3.26-r0 +php7-xmlwriter-7.3.26-r0 php7-zip-7.3.26-r0 popt-1.16-r7 procps-3.3.16-r0 @@ -71,7 +71,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tar-1.32-r1 -tzdata-2020c-r1 +tzdata-2020f-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 03fe7fe58fcfc92e15105982b44c7e2c2de32826 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Jan 2021 12:23:31 -0800 Subject: [PATCH 153/262] Rebasing to Alpine 3.13 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1baf261..1162fec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7c0cb24..6902f93 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 02f2a1b..2817ede 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index 61d7101..9147ce8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } - { date: "17.08.20:", desc: "Add php7-curl." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "17.01.20:", desc: "Use nginx from baseimage." } From 4aea30f968cded1ad61582456ba2b2af2f6c46cb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 7 Feb 2021 07:57:54 +0000 Subject: [PATCH 154/262] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c24e013..f8242f5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,23 +46,23 @@ openssl-1.1.1i-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.26-r0 -php7-common-7.3.26-r0 -php7-ctype-7.3.26-r0 -php7-curl-7.3.26-r0 +php7-common-7.3.27-r0 +php7-ctype-7.3.27-r0 +php7-curl-7.3.27-r0 php7-fileinfo-7.3.26-r0 php7-fpm-7.3.26-r0 php7-json-7.3.26-r0 php7-mbstring-7.3.26-r0 php7-openssl-7.3.26-r0 -php7-pdo-7.3.26-r0 -php7-pdo_pgsql-7.3.26-r0 -php7-pdo_sqlite-7.3.26-r0 +php7-pdo-7.3.27-r0 +php7-pdo_pgsql-7.3.27-r0 +php7-pdo_sqlite-7.3.27-r0 php7-session-7.3.26-r0 php7-simplexml-7.3.26-r0 -php7-tokenizer-7.3.26-r0 +php7-tokenizer-7.3.27-r0 php7-xml-7.3.26-r0 php7-xmlwriter-7.3.26-r0 -php7-zip-7.3.26-r0 +php7-zip-7.3.27-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From b8370268a11edada7cfdb9ac09bbb7630b524a92 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 10 Feb 2021 16:28:27 +0000 Subject: [PATCH 155/262] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fdd13db..e81d67d 100644 --- a/README.md +++ b/README.md @@ -236,6 +236,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.01.21:** - Rebasing to alpine 3.13. * **17.08.20:** - Add php7-curl. * **01.06.20:** - Rebasing to alpine 3.12. * **17.01.20:** - Use nginx from baseimage. From 27855c22098c25599b353961b4440e5b448cb6a9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 10 Feb 2021 16:30:18 +0000 Subject: [PATCH 156/262] Bot Updating Package Versions --- package_versions.txt | 125 ++++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 60 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f8242f5..553bd1e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,77 +1,82 @@ -alpine-baselayout-3.2.0-r7 +alpine-baselayout-3.2.0-r8 alpine-keys-2.2-r0 -apache2-utils-2.4.46-r1 -apk-tools-2.10.5-r1 +apache2-utils-2.4.46-r3 +apk-tools-2.12.1-r0 apr-1.7.0-r0 -apr-util-1.6.1-r6 +apr-util-1.6.1-r7 argon2-libs-20190702-r1 -bash-5.0.17-r0 -busybox-1.31.1-r19 -ca-certificates-20191127-r4 -ca-certificates-bundle-20191127-r4 -coreutils-8.32-r0 -curl-7.69.1-r3 -db-5.3.28-r1 -expat-2.2.9-r1 -git-2.26.2-r0 +bash-5.1.0-r0 +brotli-libs-1.0.9-r3 +busybox-1.32.1-r2 +ca-certificates-20191127-r5 +ca-certificates-bundle-20191127-r5 +coreutils-8.32-r2 +curl-7.74.0-r0 +expat-2.2.10-r1 +gdbm-1.19-r0 +git-2.30.0-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1i-r0 -libcurl-7.69.1-r3 -libedit-20191231.3.1-r0 -libintl-0.20.2-r0 -libldap-2.4.50-r1 -libmagic-5.38-r0 -libpq-12.5-r0 +libcurl-7.74.0-r0 +libedit-20191231.3.1-r1 +libintl-0.20.2-r2 +libldap-2.4.56-r0 +libmagic-5.39-r0 +libpq-13.1-r2 libproc-3.3.16-r0 -libressl3.1-libcrypto-3.1.2-r0 -libressl3.1-libssl-3.1.2-r0 -libsasl-2.1.27-r6 +libressl3.1-libcrypto-3.1.5-r0 +libressl3.1-libssl-3.1.5-r0 +libsasl-2.1.27-r10 libssl1.1-1.1.1i-r0 libtls-standalone-2.9.1-r1 -libuuid-2.35.2-r0 -libxml2-2.9.10-r5 -libzip-1.6.1-r1 -linux-pam-1.3.1-r4 -logrotate-3.16.0-r0 -musl-1.1.24-r10 -musl-utils-1.1.24-r10 -nano-4.9.3-r0 -ncurses-libs-6.2_p20200523-r0 -ncurses-terminfo-base-6.2_p20200523-r0 -nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r1 +libuuid-2.36.1-r1 +libxml2-2.9.10-r6 +libzip-1.7.3-r2 +linux-pam-1.5.1-r0 +logrotate-3.18.0-r0 +musl-1.2.2-r0 +musl-utils-1.2.2-r0 +nano-5.4-r1 +ncurses-libs-6.2_p20210109-r0 +ncurses-terminfo-base-6.2_p20210109-r0 +nghttp2-libs-1.42.0-r1 +nginx-1.18.0-r13 +oniguruma-6.9.6-r0 openssl-1.1.1i-r0 pcre-8.44-r0 -pcre2-10.35-r0 -php7-7.3.26-r0 -php7-common-7.3.27-r0 -php7-ctype-7.3.27-r0 -php7-curl-7.3.27-r0 -php7-fileinfo-7.3.26-r0 -php7-fpm-7.3.26-r0 -php7-json-7.3.26-r0 -php7-mbstring-7.3.26-r0 -php7-openssl-7.3.26-r0 -php7-pdo-7.3.27-r0 -php7-pdo_pgsql-7.3.27-r0 -php7-pdo_sqlite-7.3.27-r0 -php7-session-7.3.26-r0 -php7-simplexml-7.3.26-r0 -php7-tokenizer-7.3.27-r0 -php7-xml-7.3.26-r0 -php7-xmlwriter-7.3.26-r0 -php7-zip-7.3.27-r0 -popt-1.16-r7 +pcre2-10.36-r0 +php7-7.4.14-r0 +php7-common-7.4.15-r0 +php7-ctype-7.4.15-r0 +php7-curl-7.4.15-r0 +php7-fileinfo-7.4.14-r0 +php7-fpm-7.4.14-r0 +php7-json-7.4.14-r0 +php7-mbstring-7.4.14-r0 +php7-openssl-7.4.14-r0 +php7-pdo-7.4.15-r0 +php7-pdo_pgsql-7.4.15-r0 +php7-pdo_sqlite-7.4.15-r0 +php7-session-7.4.14-r0 +php7-simplexml-7.4.14-r0 +php7-tokenizer-7.4.15-r0 +php7-xml-7.4.14-r0 +php7-xmlwriter-7.4.14-r0 +php7-zip-7.4.15-r0 +popt-1.18-r0 procps-3.3.16-r0 -readline-8.0.4-r0 -scanelf-1.2.6-r0 +readline-8.1.0-r0 +s6-ipcserver-2.10.0.0-r0 +scanelf-1.2.8-r0 shadow-4.8.1-r0 -sqlite-libs-3.32.1-r0 -ssl_client-1.31.1-r19 -tar-1.32-r1 -tzdata-2020f-r0 +skalibs-2.10.0.0-r0 +sqlite-libs-3.34.1-r0 +ssl_client-1.32.1-r2 +tar-1.33-r1 +tzdata-2021a-r0 +utmps-0.1.0.0-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From eb0f5c1d2a330a01fef6aac7f9e88a278550b2cf Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 10 Feb 2021 13:59:51 -0500 Subject: [PATCH 157/262] revert to alpine 3.12 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 3 ++- readme-vars.yml | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1162fec..1baf261 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6902f93..7c0cb24 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2817ede..02f2a1b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index e81d67d..33d15fa 100644 --- a/README.md +++ b/README.md @@ -236,7 +236,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **23.01.21:** - Rebasing to alpine 3.13. +* **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. +* **10.02.21:** - Rebasing to alpine 3.13. * **17.08.20:** - Add php7-curl. * **01.06.20:** - Rebasing to alpine 3.12. * **17.01.20:** - Use nginx from baseimage. diff --git a/readme-vars.yml b/readme-vars.yml index 9147ce8..2dd2253 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,7 +49,8 @@ app_setup_block: | # changelog changelogs: - - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." } + - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." } + - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "17.08.20:", desc: "Add php7-curl." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "17.01.20:", desc: "Use nginx from baseimage." } From f5e7e1d87f72e30008dada6a5a812e569bdb6176 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 10 Feb 2021 19:20:41 +0000 Subject: [PATCH 158/262] Bot Updating Package Versions --- package_versions.txt | 125 +++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 65 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 553bd1e..f8242f5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,82 +1,77 @@ -alpine-baselayout-3.2.0-r8 +alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 -apache2-utils-2.4.46-r3 -apk-tools-2.12.1-r0 +apache2-utils-2.4.46-r1 +apk-tools-2.10.5-r1 apr-1.7.0-r0 -apr-util-1.6.1-r7 +apr-util-1.6.1-r6 argon2-libs-20190702-r1 -bash-5.1.0-r0 -brotli-libs-1.0.9-r3 -busybox-1.32.1-r2 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 -coreutils-8.32-r2 -curl-7.74.0-r0 -expat-2.2.10-r1 -gdbm-1.19-r0 -git-2.30.0-r0 +bash-5.0.17-r0 +busybox-1.31.1-r19 +ca-certificates-20191127-r4 +ca-certificates-bundle-20191127-r4 +coreutils-8.32-r0 +curl-7.69.1-r3 +db-5.3.28-r1 +expat-2.2.9-r1 +git-2.26.2-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1i-r0 -libcurl-7.74.0-r0 -libedit-20191231.3.1-r1 -libintl-0.20.2-r2 -libldap-2.4.56-r0 -libmagic-5.39-r0 -libpq-13.1-r2 +libcurl-7.69.1-r3 +libedit-20191231.3.1-r0 +libintl-0.20.2-r0 +libldap-2.4.50-r1 +libmagic-5.38-r0 +libpq-12.5-r0 libproc-3.3.16-r0 -libressl3.1-libcrypto-3.1.5-r0 -libressl3.1-libssl-3.1.5-r0 -libsasl-2.1.27-r10 +libressl3.1-libcrypto-3.1.2-r0 +libressl3.1-libssl-3.1.2-r0 +libsasl-2.1.27-r6 libssl1.1-1.1.1i-r0 libtls-standalone-2.9.1-r1 -libuuid-2.36.1-r1 -libxml2-2.9.10-r6 -libzip-1.7.3-r2 -linux-pam-1.5.1-r0 -logrotate-3.18.0-r0 -musl-1.2.2-r0 -musl-utils-1.2.2-r0 -nano-5.4-r1 -ncurses-libs-6.2_p20210109-r0 -ncurses-terminfo-base-6.2_p20210109-r0 -nghttp2-libs-1.42.0-r1 -nginx-1.18.0-r13 -oniguruma-6.9.6-r0 +libuuid-2.35.2-r0 +libxml2-2.9.10-r5 +libzip-1.6.1-r1 +linux-pam-1.3.1-r4 +logrotate-3.16.0-r0 +musl-1.1.24-r10 +musl-utils-1.1.24-r10 +nano-4.9.3-r0 +ncurses-libs-6.2_p20200523-r0 +ncurses-terminfo-base-6.2_p20200523-r0 +nghttp2-libs-1.41.0-r0 +nginx-1.18.0-r1 openssl-1.1.1i-r0 pcre-8.44-r0 -pcre2-10.36-r0 -php7-7.4.14-r0 -php7-common-7.4.15-r0 -php7-ctype-7.4.15-r0 -php7-curl-7.4.15-r0 -php7-fileinfo-7.4.14-r0 -php7-fpm-7.4.14-r0 -php7-json-7.4.14-r0 -php7-mbstring-7.4.14-r0 -php7-openssl-7.4.14-r0 -php7-pdo-7.4.15-r0 -php7-pdo_pgsql-7.4.15-r0 -php7-pdo_sqlite-7.4.15-r0 -php7-session-7.4.14-r0 -php7-simplexml-7.4.14-r0 -php7-tokenizer-7.4.15-r0 -php7-xml-7.4.14-r0 -php7-xmlwriter-7.4.14-r0 -php7-zip-7.4.15-r0 -popt-1.18-r0 +pcre2-10.35-r0 +php7-7.3.26-r0 +php7-common-7.3.27-r0 +php7-ctype-7.3.27-r0 +php7-curl-7.3.27-r0 +php7-fileinfo-7.3.26-r0 +php7-fpm-7.3.26-r0 +php7-json-7.3.26-r0 +php7-mbstring-7.3.26-r0 +php7-openssl-7.3.26-r0 +php7-pdo-7.3.27-r0 +php7-pdo_pgsql-7.3.27-r0 +php7-pdo_sqlite-7.3.27-r0 +php7-session-7.3.26-r0 +php7-simplexml-7.3.26-r0 +php7-tokenizer-7.3.27-r0 +php7-xml-7.3.26-r0 +php7-xmlwriter-7.3.26-r0 +php7-zip-7.3.27-r0 +popt-1.16-r7 procps-3.3.16-r0 -readline-8.1.0-r0 -s6-ipcserver-2.10.0.0-r0 -scanelf-1.2.8-r0 +readline-8.0.4-r0 +scanelf-1.2.6-r0 shadow-4.8.1-r0 -skalibs-2.10.0.0-r0 -sqlite-libs-3.34.1-r0 -ssl_client-1.32.1-r2 -tar-1.33-r1 -tzdata-2021a-r0 -utmps-0.1.0.0-r0 +sqlite-libs-3.32.1-r0 +ssl_client-1.31.1-r19 +tar-1.32-r1 +tzdata-2020f-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From b01a5da02cd1b42c893a115ed528a2a489689980 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Feb 2021 07:57:48 +0000 Subject: [PATCH 159/262] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7ff8fd..dfb3a7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -241,10 +241,53 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + 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 master + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." + fi + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + 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 master + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} @@ -252,11 +295,13 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore + fi git add ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -265,8 +310,8 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -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}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -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}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' @@ -276,13 +321,13 @@ pipeline { git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, skipping Unraid template upload" else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' @@ -522,7 +567,7 @@ pipeline { } sh '''#! /bin/bash set -e - docker pull ghcr.io/linuxserver/lsiodev-ci:latest + docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} @@ -547,7 +592,7 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t ghcr.io/linuxserver/lsiodev-ci:latest \ + -t ghcr.io/linuxserver/ci:latest \ python /ci/ci.py''' } } @@ -692,9 +737,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" + echo "Pushing New tag for current commit ${META_TAG}" 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}'",\ + -d '{"tag":"'${META_TAG}'",\ "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ "type": "commit",\ @@ -702,9 +747,9 @@ pipeline { 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}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ - "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "name": "'${META_TAG}'",\ "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 @@ -731,7 +776,7 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/lsiodev-readme-sync + docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -739,7 +784,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } From 506f897e4b09a6041cf7e7df65e51990009736f5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Feb 2021 07:59:14 +0000 Subject: [PATCH 160/262] Bot Updating Templated Files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 96374c4..6e8ad97 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk +.jenkins-external From 14ae52479d668148a9c37221bf07ee310eac2674 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Feb 2021 08:02:30 +0000 Subject: [PATCH 161/262] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f8242f5..f905269 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,23 +45,23 @@ nginx-1.18.0-r1 openssl-1.1.1i-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.26-r0 +php7-7.3.27-r0 php7-common-7.3.27-r0 php7-ctype-7.3.27-r0 php7-curl-7.3.27-r0 -php7-fileinfo-7.3.26-r0 -php7-fpm-7.3.26-r0 -php7-json-7.3.26-r0 -php7-mbstring-7.3.26-r0 -php7-openssl-7.3.26-r0 +php7-fileinfo-7.3.27-r0 +php7-fpm-7.3.27-r0 +php7-json-7.3.27-r0 +php7-mbstring-7.3.27-r0 +php7-openssl-7.3.27-r0 php7-pdo-7.3.27-r0 php7-pdo_pgsql-7.3.27-r0 php7-pdo_sqlite-7.3.27-r0 -php7-session-7.3.26-r0 -php7-simplexml-7.3.26-r0 +php7-session-7.3.27-r0 +php7-simplexml-7.3.27-r0 php7-tokenizer-7.3.27-r0 -php7-xml-7.3.26-r0 -php7-xmlwriter-7.3.26-r0 +php7-xml-7.3.27-r0 +php7-xmlwriter-7.3.27-r0 php7-zip-7.3.27-r0 popt-1.16-r7 procps-3.3.16-r0 @@ -71,7 +71,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tar-1.32-r1 -tzdata-2020f-r0 +tzdata-2021a-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 75f623a8a7b508f56dcde44c3c300eea5da20cb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Feb 2021 02:58:17 -0500 Subject: [PATCH 162/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f905269..61cd4f2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ git-2.26.2-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1i-r0 +libcrypto1.1-1.1.1j-r0 libcurl-7.69.1-r3 libedit-20191231.3.1-r0 libintl-0.20.2-r0 @@ -28,7 +28,7 @@ libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 -libssl1.1-1.1.1i-r0 +libssl1.1-1.1.1j-r0 libtls-standalone-2.9.1-r1 libuuid-2.35.2-r0 libxml2-2.9.10-r5 @@ -42,7 +42,7 @@ ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r1 -openssl-1.1.1i-r0 +openssl-1.1.1j-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.27-r0 From 9c89c372776357c0c81cd7dba963460343d71ad9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Feb 2021 02:58:15 -0500 Subject: [PATCH 163/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 61cd4f2..41f3c17 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,9 +21,9 @@ libcrypto1.1-1.1.1j-r0 libcurl-7.69.1-r3 libedit-20191231.3.1-r0 libintl-0.20.2-r0 -libldap-2.4.50-r1 +libldap-2.4.50-r2 libmagic-5.38-r0 -libpq-12.5-r0 +libpq-12.6-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 From e480e92898eb3a6bd0e5333f86059dda4ace9344 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Mar 2021 07:58:53 +0000 Subject: [PATCH 164/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 41f3c17..052ef02 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ coreutils-8.32-r0 curl-7.69.1-r3 db-5.3.28-r1 expat-2.2.9-r1 -git-2.26.2-r0 +git-2.26.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 From 89613cb9b6d48a20db14f859941a48f64ab0bf71 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Mar 2021 03:58:44 -0400 Subject: [PATCH 165/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 052ef02..8f03645 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ git-2.26.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1j-r0 +libcrypto1.1-1.1.1k-r0 libcurl-7.69.1-r3 libedit-20191231.3.1-r0 libintl-0.20.2-r0 @@ -28,7 +28,7 @@ libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 -libssl1.1-1.1.1j-r0 +libssl1.1-1.1.1k-r0 libtls-standalone-2.9.1-r1 libuuid-2.35.2-r0 libxml2-2.9.10-r5 @@ -42,7 +42,7 @@ ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r1 -openssl-1.1.1j-r0 +openssl-1.1.1k-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.27-r0 From fa143f562a1a5d7cd70c5e2741effe192e7b1080 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 29 Mar 2021 18:41:54 +0100 Subject: [PATCH 166/262] Added php7-pdo_mysql extension --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1baf261..916d7a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN \ php7-curl \ php7-pdo_pgsql \ php7-pdo_sqlite \ + php7-pdo_mysql \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7c0cb24..1dc8dd1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,6 +18,7 @@ RUN \ php7-curl \ php7-pdo_pgsql \ php7-pdo_sqlite \ + php7-pdo_mysql \ php7-tokenizer \ php7-zip \ tar && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 02f2a1b..7c766c1 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -18,6 +18,7 @@ RUN \ php7-curl \ php7-pdo_pgsql \ php7-pdo_sqlite \ + php7-pdo_mysql \ php7-tokenizer \ php7-zip \ tar && \ From 19045302aa50478b2dd85dd8dfc7641721847ee2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Apr 2021 07:57:57 +0000 Subject: [PATCH 167/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8f03645..6deedbf 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 bash-5.0.17-r0 -busybox-1.31.1-r19 +busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 @@ -69,7 +69,7 @@ readline-8.0.4-r0 scanelf-1.2.6-r0 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 -ssl_client-1.31.1-r19 +ssl_client-1.31.1-r20 tar-1.32-r1 tzdata-2021a-r0 xz-5.2.5-r0 From 3a5f3d4b79397706b619366df2fdca7335c32309 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 11 Apr 2021 03:58:11 -0400 Subject: [PATCH 168/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6deedbf..9845e6a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 apache2-utils-2.4.46-r1 -apk-tools-2.10.5-r1 +apk-tools-2.10.5-r3 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 @@ -70,7 +70,7 @@ scanelf-1.2.6-r0 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r20 -tar-1.32-r1 +tar-1.32-r2 tzdata-2021a-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 From a59631760cfbab767fe7b5988cfd27a328df0bf0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Apr 2021 07:57:34 +0000 Subject: [PATCH 169/262] Bot Updating Templated Files --- Jenkinsfile | 92 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dfb3a7c..8f363aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { 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 - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -106,7 +106,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', + script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', returnStdout: true).trim() } } @@ -317,22 +317,24 @@ pipeline { git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi - mkdir -p ${TEMPDIR}/unraid + mkdir -p ${TEMPDIR}/unraid git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, skipping Unraid template upload" + echo "Image is on the ignore list, removing Unraid template" + git rm unraid/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Removing Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi rm -Rf ${TEMPDIR}''' script{ @@ -389,8 +391,21 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-heimdall/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-heimdall\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-heimdall\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Heimdall\" \ + --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.\" \ + --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -403,8 +418,21 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-heimdall/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-heimdall\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-heimdall\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Heimdall\" \ + --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.\" \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -417,8 +445,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-heimdall/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-heimdall\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-heimdall\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Heimdall\" \ + --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.\" \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -438,8 +479,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-heimdall/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-heimdall\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-heimdall\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Heimdall\" \ + --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.\" \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -746,11 +800,11 @@ pipeline { "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 + curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\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''' @@ -775,7 +829,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ From 592800134314e68d6ec853fe05ccd4d81007a98a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Apr 2021 07:59:01 +0000 Subject: [PATCH 170/262] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 7 ++--- README.md | 57 ++++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index abc46f3..6ff48b1 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the ### Testing your changes -``` +```bash git clone https://github.com/linuxserver/docker-heimdall.git cd docker-heimdall docker build \ @@ -106,13 +106,14 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. -## Update the chagelog +## Update the changelog If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/master/root), add an entry to the changelog diff --git a/README.md b/README.md index 33d15fa..426b217 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) @@ -12,13 +12,14 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: - * regular and timely application updates - * easy user mappings (PGID, PUID) - * custom base image with s6 overlay - * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth - * regular security updates +* regular and timely application updates +* easy user mappings (PGID, PUID) +* custom base image with s6 overlay +* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth +* regular security updates Find us at: + * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. @@ -67,6 +68,15 @@ This image provides various versions that are available via tags. `latest` tag u | latest | Stable Heimdall releases. | | development | Latest commit from the github master branch. | +## Application Setup + +Access the web gui at http://SERVERIP:PORT + + +### Adding password protection + +This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. + ## Usage Here are some example snippets to help you get started creating a container. @@ -96,7 +106,7 @@ services: ### docker cli -``` +```bash docker run -d \ --name=heimdall \ -e PUID=1000 \ @@ -109,7 +119,6 @@ docker run -d \ ghcr.io/linuxserver/heimdall ``` - ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -129,7 +138,7 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: -``` +```bash -e FILE__PASSWORD=/run/secrets/mysecretpassword ``` @@ -148,29 +157,17 @@ Ensure any volume directories on the host are owned by the same user you specify In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: -``` +```bash $ id username uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) ``` - -  -## Application Setup - -Access the web gui at http://SERVERIP:PORT - - -### Adding password protection - -This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. - - ## Docker Mods + [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=heimdall&query=%24.mods%5B%27heimdall%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=heimdall "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. - ## Support Info * Shell access whilst the container is running: `docker exec -it heimdall /bin/bash` @@ -187,6 +184,7 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: ### Via Docker Compose + * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull heimdall` * Let compose update all containers as necessary: `docker-compose up -d` @@ -194,6 +192,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run + * Update the image: `docker pull ghcr.io/linuxserver/heimdall` * Stop the running container: `docker stop heimdall` * Delete the container: `docker rm heimdall` @@ -201,24 +200,29 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Watchtower auto-updater (only use 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: - ``` + + ```bash 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` **Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). ### Image Update Notifications - Diun (Docker Image Update Notifier) + * We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: -``` + +```bash git clone https://github.com/linuxserver/docker-heimdall.git cd docker-heimdall docker build \ @@ -228,7 +232,8 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` From 5347642ec04f42f751612d46461d50bf3724749a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Apr 2021 09:02:03 +0100 Subject: [PATCH 171/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9845e6a..411b125 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 apache2-utils-2.4.46-r1 -apk-tools-2.10.5-r3 +apk-tools-2.10.6-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 @@ -10,7 +10,7 @@ busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.69.1-r3 +curl-7.76.1-r0 db-5.3.28-r1 expat-2.2.9-r1 git-2.26.3-r0 @@ -18,7 +18,7 @@ libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1k-r0 -libcurl-7.69.1-r3 +libcurl-7.76.1-r0 libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 From 0c058256a722d81992924f644a14046f1ab04cb5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 29 Apr 2021 17:01:46 +0100 Subject: [PATCH 172/262] Bot Updating Package Versions --- package_versions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 411b125..87986d5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -53,8 +53,10 @@ php7-fileinfo-7.3.27-r0 php7-fpm-7.3.27-r0 php7-json-7.3.27-r0 php7-mbstring-7.3.27-r0 +php7-mysqlnd-7.3.27-r0 php7-openssl-7.3.27-r0 php7-pdo-7.3.27-r0 +php7-pdo_mysql-7.3.27-r0 php7-pdo_pgsql-7.3.27-r0 php7-pdo_sqlite-7.3.27-r0 php7-session-7.3.27-r0 From a882969011b6bef005be2707458e7da415978eb3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 23 May 2021 08:01:11 +0000 Subject: [PATCH 173/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 87986d5..c520d94 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 libmagic-5.38-r0 -libpq-12.6-r0 +libpq-12.7-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 From 69e79491367d494d5ff3b477c4bf2c9fa214014b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 May 2021 08:35:59 +0000 Subject: [PATCH 174/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c520d94..9668504 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.76.1-r0 +curl-7.77.0-r0 db-5.3.28-r1 expat-2.2.9-r1 git-2.26.3-r0 @@ -18,7 +18,7 @@ libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1k-r0 -libcurl-7.76.1-r0 +libcurl-7.77.0-r0 libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 @@ -41,7 +41,7 @@ nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r1 +nginx-1.18.0-r2 openssl-1.1.1k-r0 pcre-8.44-r0 pcre2-10.35-r0 From 96b759744368ef98021c04c4dc0c4fd95c67a991 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Jun 2021 08:34:32 +0000 Subject: [PATCH 175/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9668504..162ba52 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,7 +41,7 @@ nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r2 +nginx-1.18.0-r3 openssl-1.1.1k-r0 pcre-8.44-r0 pcre2-10.35-r0 @@ -70,7 +70,7 @@ procps-3.3.16-r0 readline-8.0.4-r0 scanelf-1.2.6-r0 shadow-4.8.1-r0 -sqlite-libs-3.32.1-r0 +sqlite-libs-3.32.1-r1 ssl_client-1.31.1-r20 tar-1.32-r2 tzdata-2021a-r0 From befde6b719999f2afbeb9e8c09751a94ece8f924 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Jun 2021 08:00:42 +0000 Subject: [PATCH 176/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 162ba52..d5461f6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,7 +31,7 @@ libsasl-2.1.27-r6 libssl1.1-1.1.1k-r0 libtls-standalone-2.9.1-r1 libuuid-2.35.2-r0 -libxml2-2.9.10-r5 +libxml2-2.9.10-r6 libzip-1.6.1-r1 linux-pam-1.3.1-r4 logrotate-3.16.0-r0 From af43fa219652776d106c23b1415af7f6d676f177 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 20 Jun 2021 03:59:16 -0400 Subject: [PATCH 177/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d5461f6..7217c8d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 -apache2-utils-2.4.46-r1 +apache2-utils-2.4.48-r0 apk-tools-2.10.6-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 From 04021a3cec15ffc065ac56dc10cea607a72dbf56 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Jul 2021 07:58:15 +0000 Subject: [PATCH 178/262] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f363aa..cc1780b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { 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 - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -270,7 +270,6 @@ pipeline { git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f master - cd ${TEMPDIR}/docker-${CONTAINER_NAME} for i in ${TEMPLATES_TO_DELETE}; do git rm "${i}" done @@ -531,6 +530,15 @@ pipeline { apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "fedora" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + rpm -qa > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "arch" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + pacman -Q > /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" From bd2c7742bc62406e969c013865d188b8e855d930 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Jul 2021 07:59:52 +0000 Subject: [PATCH 179/262] Bot Updating Templated Files --- .editorconfig | 20 ++++++++++++++++++++ .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/stale.yml | 2 +- README.md | 7 ++----- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100755 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 0000000..a92f7df --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# This file is globally distributed to all container image projects from +# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +# trim_trailing_whitespace may cause unintended issues and should not be globally set true +trim_trailing_whitespace = false + +[{Dockerfile*,**.yml}] +indent_style = space +indent_size = 2 + +[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +indent_style = space +indent_size = 4 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6ff48b1..f523237 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,7 +4,7 @@ * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. * Read, and fill the Pull Request template - * If this is a fix for a typo in code or documentation in the README please file an issue + * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ee5cdee..cf51975 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ - + diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1806420..3b3846e 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v1 + - uses: actions/stale@v3 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." diff --git a/README.md b/README.md index 426b217..18e0386 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-heimdall/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-heimdall/container_registry) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) @@ -81,9 +80,7 @@ This image now supports password protection through htpasswd. Run the following Here are some example snippets to help you get started creating a container. -### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) - -Compatible with docker-compose v2 schemas. +### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml --- @@ -104,7 +101,7 @@ services: restart: unless-stopped ``` -### docker cli +### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/)) ```bash docker run -d \ From b9b5aafd739710861c1f1a9757769ead85259a68 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 11 Jul 2021 07:59:00 +0000 Subject: [PATCH 180/262] Bot Updating Package Versions --- package_versions.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7217c8d..9264c24 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,26 +45,26 @@ nginx-1.18.0-r3 openssl-1.1.1k-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.27-r0 -php7-common-7.3.27-r0 -php7-ctype-7.3.27-r0 -php7-curl-7.3.27-r0 -php7-fileinfo-7.3.27-r0 -php7-fpm-7.3.27-r0 -php7-json-7.3.27-r0 -php7-mbstring-7.3.27-r0 -php7-mysqlnd-7.3.27-r0 -php7-openssl-7.3.27-r0 -php7-pdo-7.3.27-r0 -php7-pdo_mysql-7.3.27-r0 -php7-pdo_pgsql-7.3.27-r0 -php7-pdo_sqlite-7.3.27-r0 -php7-session-7.3.27-r0 -php7-simplexml-7.3.27-r0 -php7-tokenizer-7.3.27-r0 -php7-xml-7.3.27-r0 -php7-xmlwriter-7.3.27-r0 -php7-zip-7.3.27-r0 +php7-7.3.29-r0 +php7-common-7.3.29-r0 +php7-ctype-7.3.29-r0 +php7-curl-7.3.29-r0 +php7-fileinfo-7.3.29-r0 +php7-fpm-7.3.29-r0 +php7-json-7.3.29-r0 +php7-mbstring-7.3.29-r0 +php7-mysqlnd-7.3.29-r0 +php7-openssl-7.3.29-r0 +php7-pdo-7.3.29-r0 +php7-pdo_mysql-7.3.29-r0 +php7-pdo_pgsql-7.3.29-r0 +php7-pdo_sqlite-7.3.29-r0 +php7-session-7.3.29-r0 +php7-simplexml-7.3.29-r0 +php7-tokenizer-7.3.29-r0 +php7-xml-7.3.29-r0 +php7-xmlwriter-7.3.29-r0 +php7-zip-7.3.29-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From e7ec5fa84dae284f169492d016d4331d914a3f4b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Jul 2021 09:58:06 +0200 Subject: [PATCH 181/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9264c24..fae9448 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.77.0-r0 +curl-7.78.0-r0 db-5.3.28-r1 expat-2.2.9-r1 git-2.26.3-r0 @@ -18,7 +18,7 @@ libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1k-r0 -libcurl-7.77.0-r0 +libcurl-7.78.0-r0 libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 From a23caa394d4e473227d14b1ba41c48237afb4c96 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 1 Aug 2021 09:58:08 +0200 Subject: [PATCH 182/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index fae9448..19293c0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -31,7 +31,7 @@ libsasl-2.1.27-r6 libssl1.1-1.1.1k-r0 libtls-standalone-2.9.1-r1 libuuid-2.35.2-r0 -libxml2-2.9.10-r6 +libxml2-2.9.12-r0 libzip-1.6.1-r1 linux-pam-1.3.1-r4 logrotate-3.16.0-r0 From 331f81a43a27c44d6ee3779466cca9d516af4611 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 8 Aug 2021 09:58:39 +0200 Subject: [PATCH 183/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 19293c0..5cd47c5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 apache2-utils-2.4.48-r0 -apk-tools-2.10.6-r0 +apk-tools-2.10.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 From d049f5069765a95df7e85bf8ee466400f0bd9e67 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 15 Aug 2021 09:58:29 +0200 Subject: [PATCH 184/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5cd47c5..d20c2bf 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 apache2-utils-2.4.48-r0 -apk-tools-2.10.7-r0 +apk-tools-2.10.8-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 From 1fdc74ecdfbf1a9172759196c849a8c361404516 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 22 Aug 2021 09:58:49 +0200 Subject: [PATCH 185/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d20c2bf..b233d10 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 libmagic-5.38-r0 -libpq-12.7-r0 +libpq-12.8-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 From 0406b3bf64f9feecc78ba46241eecfdf3ea47648 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 29 Aug 2021 09:57:35 +0200 Subject: [PATCH 186/262] Bot Updating Templated Files --- Jenkinsfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc1780b..878d8e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -385,7 +385,9 @@ pipeline { // Build Docker container for push to LS Repo stage('Build-Single') { when { - environment name: 'MULTIARCH', value: 'false' + expression { + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + } environment name: 'EXIT_STATUS', value: '' } steps { @@ -410,7 +412,10 @@ pipeline { // Build MultiArch Docker containers for push to LS Repo stage('Build-Multi') { when { - environment name: 'MULTIARCH', value: 'true' + allOf { + environment name: 'MULTIARCH', value: 'true' + expression { params.PACKAGE_CHECK == 'false' } + } environment name: 'EXIT_STATUS', value: '' } parallel { @@ -515,7 +520,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} @@ -576,7 +581,7 @@ pipeline { steps { sh '''#! /bin/bash echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} @@ -600,7 +605,7 @@ pipeline { steps { sh '''#! /bin/bash echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} From b01e21ed8d67acf2145adc07884fb01783c51e66 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 29 Aug 2021 09:59:27 +0200 Subject: [PATCH 187/262] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b233d10..b941b4d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ git-2.26.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1k-r0 +libcrypto1.1-1.1.1l-r0 libcurl-7.78.0-r0 libedit-20191231.3.1-r0 libintl-0.20.2-r0 @@ -28,7 +28,7 @@ libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 -libssl1.1-1.1.1k-r0 +libssl1.1-1.1.1l-r0 libtls-standalone-2.9.1-r1 libuuid-2.35.2-r0 libxml2-2.9.12-r0 @@ -42,29 +42,29 @@ ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r3 -openssl-1.1.1k-r0 +openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.29-r0 -php7-common-7.3.29-r0 -php7-ctype-7.3.29-r0 -php7-curl-7.3.29-r0 +php7-common-7.3.30-r0 +php7-ctype-7.3.30-r0 +php7-curl-7.3.30-r0 php7-fileinfo-7.3.29-r0 php7-fpm-7.3.29-r0 php7-json-7.3.29-r0 php7-mbstring-7.3.29-r0 -php7-mysqlnd-7.3.29-r0 -php7-openssl-7.3.29-r0 -php7-pdo-7.3.29-r0 -php7-pdo_mysql-7.3.29-r0 -php7-pdo_pgsql-7.3.29-r0 -php7-pdo_sqlite-7.3.29-r0 +php7-mysqlnd-7.3.30-r0 +php7-openssl-7.3.30-r0 +php7-pdo-7.3.30-r0 +php7-pdo_mysql-7.3.30-r0 +php7-pdo_pgsql-7.3.30-r0 +php7-pdo_sqlite-7.3.30-r0 php7-session-7.3.29-r0 php7-simplexml-7.3.29-r0 -php7-tokenizer-7.3.29-r0 +php7-tokenizer-7.3.30-r0 php7-xml-7.3.29-r0 php7-xmlwriter-7.3.29-r0 -php7-zip-7.3.29-r0 +php7-zip-7.3.30-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From 71b1e4eac5c5cdbbbb4c2f6bab25d40cd077ade0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 5 Sep 2021 09:57:55 +0200 Subject: [PATCH 188/262] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b941b4d..787114d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,25 +45,25 @@ nginx-1.18.0-r3 openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.29-r0 +php7-7.3.30-r0 php7-common-7.3.30-r0 php7-ctype-7.3.30-r0 php7-curl-7.3.30-r0 -php7-fileinfo-7.3.29-r0 -php7-fpm-7.3.29-r0 -php7-json-7.3.29-r0 -php7-mbstring-7.3.29-r0 +php7-fileinfo-7.3.30-r0 +php7-fpm-7.3.30-r0 +php7-json-7.3.30-r0 +php7-mbstring-7.3.30-r0 php7-mysqlnd-7.3.30-r0 php7-openssl-7.3.30-r0 php7-pdo-7.3.30-r0 php7-pdo_mysql-7.3.30-r0 php7-pdo_pgsql-7.3.30-r0 php7-pdo_sqlite-7.3.30-r0 -php7-session-7.3.29-r0 -php7-simplexml-7.3.29-r0 +php7-session-7.3.30-r0 +php7-simplexml-7.3.30-r0 php7-tokenizer-7.3.30-r0 -php7-xml-7.3.29-r0 -php7-xmlwriter-7.3.29-r0 +php7-xml-7.3.30-r0 +php7-xmlwriter-7.3.30-r0 php7-zip-7.3.30-r0 popt-1.16-r7 procps-3.3.16-r0 From 3cc067847358efe25868859e384cb3c9f5adba70 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Sep 2021 09:57:48 +0200 Subject: [PATCH 189/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 787114d..3d8157d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.78.0-r0 +curl-7.79.0-r0 db-5.3.28-r1 expat-2.2.9-r1 git-2.26.3-r0 @@ -18,7 +18,7 @@ libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1l-r0 -libcurl-7.78.0-r0 +libcurl-7.79.0-r0 libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 From 7b74d2e60141ffa40be270c4777b05fd417f5e7a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 26 Sep 2021 09:57:53 +0200 Subject: [PATCH 190/262] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3d8157d..87d55c7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 -apache2-utils-2.4.48-r0 +apache2-utils-2.4.49-r0 apk-tools-2.10.8-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 @@ -10,7 +10,7 @@ busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 -curl-7.79.0-r0 +curl-7.79.1-r0 db-5.3.28-r1 expat-2.2.9-r1 git-2.26.3-r0 @@ -18,7 +18,7 @@ libacl-2.2.53-r0 libattr-2.4.48-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1l-r0 -libcurl-7.79.0-r0 +libcurl-7.79.1-r0 libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 @@ -46,25 +46,25 @@ openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.30-r0 -php7-common-7.3.30-r0 -php7-ctype-7.3.30-r0 -php7-curl-7.3.30-r0 +php7-common-7.3.31-r0 +php7-ctype-7.3.31-r0 +php7-curl-7.3.31-r0 php7-fileinfo-7.3.30-r0 php7-fpm-7.3.30-r0 php7-json-7.3.30-r0 php7-mbstring-7.3.30-r0 -php7-mysqlnd-7.3.30-r0 -php7-openssl-7.3.30-r0 -php7-pdo-7.3.30-r0 -php7-pdo_mysql-7.3.30-r0 -php7-pdo_pgsql-7.3.30-r0 -php7-pdo_sqlite-7.3.30-r0 +php7-mysqlnd-7.3.31-r0 +php7-openssl-7.3.31-r0 +php7-pdo-7.3.31-r0 +php7-pdo_mysql-7.3.31-r0 +php7-pdo_pgsql-7.3.31-r0 +php7-pdo_sqlite-7.3.31-r0 php7-session-7.3.30-r0 php7-simplexml-7.3.30-r0 -php7-tokenizer-7.3.30-r0 +php7-tokenizer-7.3.31-r0 php7-xml-7.3.30-r0 php7-xmlwriter-7.3.30-r0 -php7-zip-7.3.30-r0 +php7-zip-7.3.31-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From d518918f26459d2181c8466779e6e782dd79c013 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 09:57:42 +0200 Subject: [PATCH 191/262] Bot Updating Templated Files --- Jenkinsfile | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 878d8e7..d879e19 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + SCARF_TOKEN=credentials('scarf_api_key') EXT_GIT_BRANCH = 'master' EXT_USER = 'linuxserver' EXT_REPO = 'Heimdall' @@ -126,6 +127,23 @@ pipeline { env.EXT_RELEASE_CLEAN = sh( script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() + + env.SEMVER = (new Date()).format('YYYY.MM.dd') + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + if (semver.find()) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else { + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + if (semver.find()) { + if (semver[0][3]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else if (!semver[0][3] && !semver[0][4]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}" + } + } + } + + println("SEMVER: ${env.SEMVER}") } } } @@ -140,6 +158,7 @@ pipeline { env.IMAGE = env.DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -162,6 +181,7 @@ pipeline { env.IMAGE = env.DEV_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + 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 { @@ -184,6 +204,7 @@ pipeline { env.IMAGE = env.PR_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + 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 { @@ -379,6 +400,48 @@ pipeline { "visibility":"public"}' ''' } } + /* ####################### + Scarf.sh package registry + ####################### */ + // Add package to Scarf.sh and set permissions + stage("Scarf.sh package registry"){ + when { + branch "master" + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''#! /bin/bash + set -e + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid') + if [ -z "${PACKAGE_UUID}" ]; then + echo "Adding package to Scarf.sh" + PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{"name":"linuxserver/heimdall",\ + "shortDescription":"example description",\ + "libraryType":"docker",\ + "website":"https://github.com/linuxserver/docker-heimdall",\ + "backendUrl":"https://ghcr.io/linuxserver/heimdall",\ + "publicUrl":"https://lscr.io/linuxserver/heimdall"}' \ + | jq -r .uuid) + else + echo "Package already exists on Scarf.sh" + fi + echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" + curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ + {"userQuery":"roxedus","permissionLevel":"admin"},\ + {"userQuery":"nemchik","permissionLevel":"admin"},\ + {"userQuery":"driz","permissionLevel":"admin"},\ + {"userQuery":"aptalca","permissionLevel":"admin"},\ + {"userQuery":"saarg","permissionLevel":"admin"},\ + {"userQuery":"Stark","permissionLevel":"admin"}]' + ''' + } + } /* ############### Build Container ############### */ @@ -386,7 +449,7 @@ pipeline { stage('Build-Single') { when { expression { - env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' } environment name: 'EXIT_STATUS', value: '' } @@ -680,6 +743,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -688,22 +757,26 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker push ${PUSHIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest || : + ${DELETEIMAGE}:latest \ + ${DELETEIMAGE}:${SEMVER} || : done ''' } @@ -722,6 +795,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -730,13 +809,14 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do 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} @@ -746,6 +826,9 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -755,6 +838,9 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -767,24 +853,32 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From c564dcbaddc6df1a870b5b2c5232863c0901c873 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 09:58:43 +0200 Subject: [PATCH 192/262] Bot Updating Templated Files --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 18e0386..e9de5ca 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-heimdall/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-heimdall/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/heimdall) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/) @@ -48,7 +49,7 @@ Why not use it as your browser start page? It even has the ability to include a 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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `ghcr.io/linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -87,7 +88,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: heimdall: - image: ghcr.io/linuxserver/heimdall + image: lscr.io/linuxserver/heimdall container_name: heimdall environment: - PUID=1000 @@ -113,7 +114,7 @@ docker run -d \ -p 443:443 \ -v :/config \ --restart unless-stopped \ - ghcr.io/linuxserver/heimdall + lscr.io/linuxserver/heimdall ``` ## Parameters @@ -172,7 +173,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/heimdall` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall` ## Updating Info @@ -190,7 +191,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull ghcr.io/linuxserver/heimdall` +* Update the image: `docker pull lscr.io/linuxserver/heimdall` * Stop the running container: `docker stop heimdall` * Delete the container: `docker rm heimdall` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -225,7 +226,7 @@ cd docker-heimdall docker build \ --no-cache \ --pull \ - -t ghcr.io/linuxserver/heimdall:latest . + -t lscr.io/linuxserver/heimdall:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 3a8c0601cf8e28d50e847c6bcc4a0590c07b81a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Oct 2021 10:00:45 +0200 Subject: [PATCH 193/262] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 87d55c7..4405721 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,25 +45,25 @@ nginx-1.18.0-r3 openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.30-r0 +php7-7.3.31-r0 php7-common-7.3.31-r0 php7-ctype-7.3.31-r0 php7-curl-7.3.31-r0 -php7-fileinfo-7.3.30-r0 -php7-fpm-7.3.30-r0 -php7-json-7.3.30-r0 -php7-mbstring-7.3.30-r0 +php7-fileinfo-7.3.31-r0 +php7-fpm-7.3.31-r0 +php7-json-7.3.31-r0 +php7-mbstring-7.3.31-r0 php7-mysqlnd-7.3.31-r0 php7-openssl-7.3.31-r0 php7-pdo-7.3.31-r0 php7-pdo_mysql-7.3.31-r0 php7-pdo_pgsql-7.3.31-r0 php7-pdo_sqlite-7.3.31-r0 -php7-session-7.3.30-r0 -php7-simplexml-7.3.30-r0 +php7-session-7.3.31-r0 +php7-simplexml-7.3.31-r0 php7-tokenizer-7.3.31-r0 -php7-xml-7.3.30-r0 -php7-xmlwriter-7.3.30-r0 +php7-xml-7.3.31-r0 +php7-xmlwriter-7.3.31-r0 php7-zip-7.3.31-r0 popt-1.16-r7 procps-3.3.16-r0 @@ -73,7 +73,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r1 ssl_client-1.31.1-r20 tar-1.32-r2 -tzdata-2021a-r0 +tzdata-2021b-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From dc095a5aca3df8a605cf84f6f163bcd6b772553e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 10 Oct 2021 09:57:52 +0200 Subject: [PATCH 194/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4405721..53548f9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 -apache2-utils-2.4.49-r0 +apache2-utils-2.4.50-r0 apk-tools-2.10.8-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 @@ -73,7 +73,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r1 ssl_client-1.31.1-r20 tar-1.32-r2 -tzdata-2021b-r0 +tzdata-2021c-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 71bcdc26f7b67294a3f90581cc1d8107e016b0c6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 17 Oct 2021 09:58:07 +0200 Subject: [PATCH 195/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 53548f9..cc2b0d1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 -apache2-utils-2.4.50-r0 +apache2-utils-2.4.51-r0 apk-tools-2.10.8-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 From 40035904410c221d3f148437bae90422a6991925 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Oct 2021 09:58:21 +0200 Subject: [PATCH 196/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cc2b0d1..9662ba5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ alpine-baselayout-3.2.0-r7 -alpine-keys-2.2-r0 +alpine-keys-2.4-r0 apache2-utils-2.4.51-r0 apk-tools-2.10.8-r0 apr-1.7.0-r0 @@ -73,7 +73,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r1 ssl_client-1.31.1-r20 tar-1.32-r2 -tzdata-2021c-r0 +tzdata-2021d-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 3949667e63662a8d8417b051f266190eecb439e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 31 Oct 2021 08:57:43 +0100 Subject: [PATCH 197/262] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9662ba5..747da4a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,25 +46,25 @@ openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.31-r0 -php7-common-7.3.31-r0 -php7-ctype-7.3.31-r0 -php7-curl-7.3.31-r0 +php7-common-7.3.32-r0 +php7-ctype-7.3.32-r0 +php7-curl-7.3.32-r0 php7-fileinfo-7.3.31-r0 php7-fpm-7.3.31-r0 php7-json-7.3.31-r0 php7-mbstring-7.3.31-r0 -php7-mysqlnd-7.3.31-r0 -php7-openssl-7.3.31-r0 -php7-pdo-7.3.31-r0 -php7-pdo_mysql-7.3.31-r0 -php7-pdo_pgsql-7.3.31-r0 -php7-pdo_sqlite-7.3.31-r0 +php7-mysqlnd-7.3.32-r0 +php7-openssl-7.3.32-r0 +php7-pdo-7.3.32-r0 +php7-pdo_mysql-7.3.32-r0 +php7-pdo_pgsql-7.3.32-r0 +php7-pdo_sqlite-7.3.32-r0 php7-session-7.3.31-r0 php7-simplexml-7.3.31-r0 -php7-tokenizer-7.3.31-r0 +php7-tokenizer-7.3.32-r0 php7-xml-7.3.31-r0 php7-xmlwriter-7.3.31-r0 -php7-zip-7.3.31-r0 +php7-zip-7.3.32-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 @@ -73,7 +73,7 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r1 ssl_client-1.31.1-r20 tar-1.32-r2 -tzdata-2021d-r0 +tzdata-2021e-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 5fb64c3d1aba9645e827e7296cf46d974ea216e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 7 Nov 2021 08:58:30 +0100 Subject: [PATCH 198/262] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 747da4a..75baabe 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,25 +45,25 @@ nginx-1.18.0-r3 openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.31-r0 +php7-7.3.32-r0 php7-common-7.3.32-r0 php7-ctype-7.3.32-r0 php7-curl-7.3.32-r0 -php7-fileinfo-7.3.31-r0 -php7-fpm-7.3.31-r0 -php7-json-7.3.31-r0 -php7-mbstring-7.3.31-r0 +php7-fileinfo-7.3.32-r0 +php7-fpm-7.3.32-r0 +php7-json-7.3.32-r0 +php7-mbstring-7.3.32-r0 php7-mysqlnd-7.3.32-r0 php7-openssl-7.3.32-r0 php7-pdo-7.3.32-r0 php7-pdo_mysql-7.3.32-r0 php7-pdo_pgsql-7.3.32-r0 php7-pdo_sqlite-7.3.32-r0 -php7-session-7.3.31-r0 -php7-simplexml-7.3.31-r0 +php7-session-7.3.32-r0 +php7-simplexml-7.3.32-r0 php7-tokenizer-7.3.32-r0 -php7-xml-7.3.31-r0 -php7-xmlwriter-7.3.31-r0 +php7-xml-7.3.32-r0 +php7-xmlwriter-7.3.32-r0 php7-zip-7.3.32-r0 popt-1.16-r7 procps-3.3.16-r0 From 0ce2fb9e8d5ddf8e33b115b96b25cee311e44c90 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Nov 2021 08:58:06 +0100 Subject: [PATCH 199/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 75baabe..7779a1d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 bash-5.0.17-r0 -busybox-1.31.1-r20 +busybox-1.31.1-r21 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 coreutils-8.32-r0 @@ -23,7 +23,7 @@ libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 libmagic-5.38-r0 -libpq-12.8-r0 +libpq-12.9-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 @@ -71,7 +71,7 @@ readline-8.0.4-r0 scanelf-1.2.6-r0 shadow-4.8.1-r0 sqlite-libs-3.32.1-r1 -ssl_client-1.31.1-r20 +ssl_client-1.31.1-r21 tar-1.32-r2 tzdata-2021e-r0 xz-5.2.5-r0 From 0ca5a50c276f527eb5770a508f88ea6e4c33ac3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Nov 2021 08:58:19 +0100 Subject: [PATCH 200/262] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7779a1d..5b18907 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -46,25 +46,25 @@ openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.32-r0 -php7-common-7.3.32-r0 -php7-ctype-7.3.32-r0 -php7-curl-7.3.32-r0 +php7-common-7.3.33-r0 +php7-ctype-7.3.33-r0 +php7-curl-7.3.33-r0 php7-fileinfo-7.3.32-r0 php7-fpm-7.3.32-r0 php7-json-7.3.32-r0 php7-mbstring-7.3.32-r0 -php7-mysqlnd-7.3.32-r0 -php7-openssl-7.3.32-r0 -php7-pdo-7.3.32-r0 -php7-pdo_mysql-7.3.32-r0 -php7-pdo_pgsql-7.3.32-r0 -php7-pdo_sqlite-7.3.32-r0 +php7-mysqlnd-7.3.33-r0 +php7-openssl-7.3.33-r0 +php7-pdo-7.3.33-r0 +php7-pdo_mysql-7.3.33-r0 +php7-pdo_pgsql-7.3.33-r0 +php7-pdo_sqlite-7.3.33-r0 php7-session-7.3.32-r0 php7-simplexml-7.3.32-r0 -php7-tokenizer-7.3.32-r0 +php7-tokenizer-7.3.33-r0 php7-xml-7.3.32-r0 php7-xmlwriter-7.3.32-r0 -php7-zip-7.3.32-r0 +php7-zip-7.3.33-r0 popt-1.16-r7 procps-3.3.16-r0 readline-8.0.4-r0 From f13db2b81392270eb07b0c7003d0b72dff0503ea Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Nov 2021 08:58:14 +0100 Subject: [PATCH 201/262] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5b18907..ee5bd8a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,25 +45,25 @@ nginx-1.18.0-r3 openssl-1.1.1l-r0 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.32-r0 +php7-7.3.33-r0 php7-common-7.3.33-r0 php7-ctype-7.3.33-r0 php7-curl-7.3.33-r0 -php7-fileinfo-7.3.32-r0 -php7-fpm-7.3.32-r0 -php7-json-7.3.32-r0 -php7-mbstring-7.3.32-r0 +php7-fileinfo-7.3.33-r0 +php7-fpm-7.3.33-r0 +php7-json-7.3.33-r0 +php7-mbstring-7.3.33-r0 php7-mysqlnd-7.3.33-r0 php7-openssl-7.3.33-r0 php7-pdo-7.3.33-r0 php7-pdo_mysql-7.3.33-r0 php7-pdo_pgsql-7.3.33-r0 php7-pdo_sqlite-7.3.33-r0 -php7-session-7.3.32-r0 -php7-simplexml-7.3.32-r0 +php7-session-7.3.33-r0 +php7-simplexml-7.3.33-r0 php7-tokenizer-7.3.33-r0 -php7-xml-7.3.32-r0 -php7-xmlwriter-7.3.32-r0 +php7-xml-7.3.33-r0 +php7-xmlwriter-7.3.33-r0 php7-zip-7.3.33-r0 popt-1.16-r7 procps-3.3.16-r0 From aabf6d39194a42cb7cf843d4b410f9d9ec04374f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Dec 2021 08:57:55 +0100 Subject: [PATCH 202/262] Bot Updating Templated Files --- Jenkinsfile | 88 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d879e19..e4d6f84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,12 +128,11 @@ pipeline { script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() - env.SEMVER = (new Date()).format('YYYY.MM.dd') - def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ if (semver.find()) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" } else { - semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/ if (semver.find()) { if (semver[0][3]) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" @@ -143,7 +142,15 @@ pipeline { } } - println("SEMVER: ${env.SEMVER}") + if (env.SEMVER != null) { + if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" + } + println("SEMVER: ${env.SEMVER}") + } else { + println("No SEMVER detected") + } + } } } @@ -412,10 +419,10 @@ pipeline { steps{ sh '''#! /bin/bash set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid') if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" - PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ -H "Authorization: Bearer ${SCARF_TOKEN}" \ -H "Content-Type: application/json" \ -d '{"name":"linuxserver/heimdall",\ @@ -423,22 +430,10 @@ pipeline { "libraryType":"docker",\ "website":"https://github.com/linuxserver/docker-heimdall",\ "backendUrl":"https://ghcr.io/linuxserver/heimdall",\ - "publicUrl":"https://lscr.io/linuxserver/heimdall"}' \ - | jq -r .uuid) + "publicUrl":"https://lscr.io/linuxserver/heimdall"}' || : else echo "Package already exists on Scarf.sh" fi - echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" - curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ - {"userQuery":"roxedus","permissionLevel":"admin"},\ - {"userQuery":"nemchik","permissionLevel":"admin"},\ - {"userQuery":"driz","permissionLevel":"admin"},\ - {"userQuery":"aptalca","permissionLevel":"admin"},\ - {"userQuery":"saarg","permissionLevel":"admin"},\ - {"userQuery":"Stark","permissionLevel":"admin"}]' ''' } } @@ -762,11 +757,15 @@ pipeline { docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + fi docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker push ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${PUSHIMAGE}:${SEMVER} + fi done ''' } @@ -775,8 +774,10 @@ pipeline { docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest \ - ${DELETEIMAGE}:${SEMVER} || : + ${DELETEIMAGE}:latest || : + if [ -n "${SEMVER}" ]; then + docker rmi ${DELETEIMAGE}:${SEMVER} || : + fi done ''' } @@ -826,9 +827,11 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -838,9 +841,11 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -853,14 +858,18 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + fi docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + fi done ''' } @@ -870,15 +879,18 @@ pipeline { ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + if [ -n "${SEMVER}" ]; then + docker rmi \ + ${DELETEIMAGE}:amd64-${SEMVER} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : + fi done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From 6b54e93c4ebcfd7d975afdd716fdedd546303056 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Dec 2021 08:59:13 +0100 Subject: [PATCH 203/262] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e9de5ca..4030028 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Find us at: # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fheimdall?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fheimdall) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-heimdall/packages) From 3af6408f4f2881cf6a798f6b7fd31e05c3e95e17 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Dec 2021 09:01:27 +0100 Subject: [PATCH 204/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ee5bd8a..171339c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -38,8 +38,8 @@ logrotate-3.16.0-r0 musl-1.1.24-r10 musl-utils-1.1.24-r10 nano-4.9.3-r0 -ncurses-libs-6.2_p20200523-r0 -ncurses-terminfo-base-6.2_p20200523-r0 +ncurses-libs-6.2_p20200523-r1 +ncurses-terminfo-base-6.2_p20200523-r1 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r3 openssl-1.1.1l-r0 From c5739b5916f241b1b2eaf86ad8be604e37d07f09 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 26 Dec 2021 08:57:57 +0100 Subject: [PATCH 205/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 171339c..c043293 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.4-r0 -apache2-utils-2.4.51-r0 +apache2-utils-2.4.52-r0 apk-tools-2.10.8-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 From b2951972b0f0f653212ad7e5e481ebc371e56af5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 23 Jan 2022 08:57:55 +0100 Subject: [PATCH 206/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c043293..a3c1209 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,12 +7,12 @@ apr-util-1.6.1-r6 argon2-libs-20190702-r1 bash-5.0.17-r0 busybox-1.31.1-r21 -ca-certificates-20191127-r4 -ca-certificates-bundle-20191127-r4 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 coreutils-8.32-r0 curl-7.79.1-r0 db-5.3.28-r1 -expat-2.2.9-r1 +expat-2.2.10-r0 git-2.26.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 From fef327d0b88bf0de1d977d06a921a77745e39b05 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Feb 2022 08:57:58 +0100 Subject: [PATCH 207/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a3c1209..127c0fa 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,7 +34,7 @@ libuuid-2.35.2-r0 libxml2-2.9.12-r0 libzip-1.6.1-r1 linux-pam-1.3.1-r4 -logrotate-3.16.0-r0 +logrotate-3.16.0-r1 musl-1.1.24-r10 musl-utils-1.1.24-r10 nano-4.9.3-r0 From 2ee91c559d76a0a70995d8282b893ef9fcb04e76 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Feb 2022 08:58:14 +0100 Subject: [PATCH 208/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 127c0fa..9f77835 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,14 +23,14 @@ libedit-20191231.3.1-r0 libintl-0.20.2-r0 libldap-2.4.50-r2 libmagic-5.38-r0 -libpq-12.9-r0 +libpq-12.10-r0 libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 libssl1.1-1.1.1l-r0 libtls-standalone-2.9.1-r1 -libuuid-2.35.2-r0 +libuuid-2.37.3-r0 libxml2-2.9.12-r0 libzip-1.6.1-r1 linux-pam-1.3.1-r4 From c29c23e7a2f230745b9f56aefdac3b1a45b74166 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 20 Feb 2022 08:57:56 +0100 Subject: [PATCH 209/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9f77835..f485084 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.4-r0 apache2-utils-2.4.52-r0 -apk-tools-2.10.8-r0 +apk-tools-2.10.8-r1 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 @@ -30,7 +30,7 @@ libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 libssl1.1-1.1.1l-r0 libtls-standalone-2.9.1-r1 -libuuid-2.37.3-r0 +libuuid-2.37.4-r0 libxml2-2.9.12-r0 libzip-1.6.1-r1 linux-pam-1.3.1-r4 From cc9a84b0cc2715dd9287b24adf392355d68a6901 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 27 Feb 2022 08:58:29 +0100 Subject: [PATCH 210/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f485084..0992f65 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ ca-certificates-bundle-20211220-r0 coreutils-8.32-r0 curl-7.79.1-r0 db-5.3.28-r1 -expat-2.2.10-r0 +expat-2.2.10-r2 git-2.26.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 From d291f8e2ec7e1ba2cac5ce5d19cd1509e4c95dca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Mar 2022 08:59:33 +0100 Subject: [PATCH 211/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0992f65..bfc8e69 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ ca-certificates-bundle-20211220-r0 coreutils-8.32-r0 curl-7.79.1-r0 db-5.3.28-r1 -expat-2.2.10-r2 +expat-2.2.10-r3 git-2.26.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 From b80ef18abb63784ff469a555c512bbe667444b07 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 11 Mar 2022 12:31:11 -0500 Subject: [PATCH 212/262] rebase to 3.14 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 5 ++--- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 916d7a3..4dd5a25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1dc8dd1..de73b9d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7c766c1..92bd786 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 # set version label ARG BUILD_DATE @@ -20,8 +20,7 @@ RUN \ php7-pdo_sqlite \ php7-pdo_mysql \ php7-tokenizer \ - php7-zip \ - tar && \ + php7-zip && \ echo "**** install heimdall ****" && \ mkdir -p \ /heimdall && \ diff --git a/README.md b/README.md index 4030028..0cbb667 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.03.21:** - Rebase to alpine 3.14. * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. * **10.02.21:** - Rebasing to alpine 3.13. * **17.08.20:** - Add php7-curl. diff --git a/readme-vars.yml b/readme-vars.yml index 2dd2253..e578ca7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.03.21:", desc: "Rebase to alpine 3.14." } - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "17.08.20:", desc: "Add php7-curl." } From 1d3e005903f7e57fa87a433c5857f85fdbece362 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 11 Mar 2022 12:33:41 -0500 Subject: [PATCH 213/262] remove gnu tar from all arches --- Dockerfile | 3 +-- Dockerfile.aarch64 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4dd5a25..338e877 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,7 @@ RUN \ php7-pdo_sqlite \ php7-pdo_mysql \ php7-tokenizer \ - php7-zip \ - tar && \ + php7-zip && \ echo "**** install heimdall ****" && \ mkdir -p \ /heimdall && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index de73b9d..c24893c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -20,8 +20,7 @@ RUN \ php7-pdo_sqlite \ php7-pdo_mysql \ php7-tokenizer \ - php7-zip \ - tar && \ + php7-zip && \ echo "**** install heimdall ****" && \ mkdir -p \ /heimdall && \ From 94538b7678dc88d4f79e26a9c228f35cb9ded008 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Mar 2022 08:58:04 +0100 Subject: [PATCH 214/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bfc8e69..ad5285a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ ca-certificates-bundle-20211220-r0 coreutils-8.32-r0 curl-7.79.1-r0 db-5.3.28-r1 -expat-2.2.10-r3 +expat-2.2.10-r4 git-2.26.3-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 @@ -21,7 +21,7 @@ libcrypto1.1-1.1.1l-r0 libcurl-7.79.1-r0 libedit-20191231.3.1-r0 libintl-0.20.2-r0 -libldap-2.4.50-r2 +libldap-2.4.58-r0 libmagic-5.38-r0 libpq-12.10-r0 libproc-3.3.16-r0 From 05a597aeae8fa1df09c8e7feb34a8b141badc23f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Mar 2022 16:34:39 +0100 Subject: [PATCH 215/262] Bot Updating Package Versions --- package_versions.txt | 120 ++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ad5285a..b7ed93f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,79 +1,83 @@ -alpine-baselayout-3.2.0-r7 +alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 apache2-utils-2.4.52-r0 -apk-tools-2.10.8-r1 +apk-tools-2.12.7-r0 apr-1.7.0-r0 -apr-util-1.6.1-r6 +apr-util-1.6.1-r7 argon2-libs-20190702-r1 -bash-5.0.17-r0 -busybox-1.31.1-r21 +bash-5.1.4-r0 +brotli-libs-1.0.9-r5 +busybox-1.33.1-r6 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 -coreutils-8.32-r0 +coreutils-8.32-r2 curl-7.79.1-r0 -db-5.3.28-r1 -expat-2.2.10-r4 -git-2.26.3-r0 +expat-2.4.7-r0 +gdbm-1.19-r0 +git-2.32.0-r0 libacl-2.2.53-r0 -libattr-2.4.48-r0 +libattr-2.5.1-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1l-r0 libcurl-7.79.1-r0 -libedit-20191231.3.1-r0 -libintl-0.20.2-r0 +libedit-20210216.3.1-r0 +libintl-0.21-r0 libldap-2.4.58-r0 -libmagic-5.38-r0 -libpq-12.10-r0 -libproc-3.3.16-r0 -libressl3.1-libcrypto-3.1.2-r0 -libressl3.1-libssl-3.1.2-r0 -libsasl-2.1.27-r6 +libmagic-5.40-r1 +libpq-13.6-r0 +libproc-3.3.17-r0 +libressl3.3-libcrypto-3.3.3-r0 +libressl3.3-libssl-3.3.3-r0 +libretls-3.3.3p1-r2 +libsasl-2.1.27-r12 libssl1.1-1.1.1l-r0 -libtls-standalone-2.9.1-r1 libuuid-2.37.4-r0 -libxml2-2.9.12-r0 -libzip-1.6.1-r1 -linux-pam-1.3.1-r4 -logrotate-3.16.0-r1 -musl-1.1.24-r10 -musl-utils-1.1.24-r10 -nano-4.9.3-r0 -ncurses-libs-6.2_p20200523-r1 -ncurses-terminfo-base-6.2_p20200523-r1 -nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r3 +libxml2-2.9.12-r1 +libzip-1.7.3-r2 +linux-pam-1.5.1-r1 +logrotate-3.18.1-r1 +musl-1.2.2-r3 +musl-utils-1.2.2-r3 +nano-5.7-r2 +ncurses-libs-6.2_p20210612-r0 +ncurses-terminfo-base-6.2_p20210612-r0 +nghttp2-libs-1.43.0-r0 +nginx-1.20.2-r0 +oniguruma-6.9.7.1-r0 openssl-1.1.1l-r0 pcre-8.44-r0 -pcre2-10.35-r0 -php7-7.3.33-r0 -php7-common-7.3.33-r0 -php7-ctype-7.3.33-r0 -php7-curl-7.3.33-r0 -php7-fileinfo-7.3.33-r0 -php7-fpm-7.3.33-r0 -php7-json-7.3.33-r0 -php7-mbstring-7.3.33-r0 -php7-mysqlnd-7.3.33-r0 -php7-openssl-7.3.33-r0 -php7-pdo-7.3.33-r0 -php7-pdo_mysql-7.3.33-r0 -php7-pdo_pgsql-7.3.33-r0 -php7-pdo_sqlite-7.3.33-r0 -php7-session-7.3.33-r0 -php7-simplexml-7.3.33-r0 -php7-tokenizer-7.3.33-r0 -php7-xml-7.3.33-r0 -php7-xmlwriter-7.3.33-r0 -php7-zip-7.3.33-r0 -popt-1.16-r7 -procps-3.3.16-r0 -readline-8.0.4-r0 -scanelf-1.2.6-r0 +pcre2-10.36-r0 +php7-7.4.26-r0 +php7-common-7.4.26-r0 +php7-ctype-7.4.26-r0 +php7-curl-7.4.26-r0 +php7-fileinfo-7.4.26-r0 +php7-fpm-7.4.26-r0 +php7-json-7.4.26-r0 +php7-mbstring-7.4.26-r0 +php7-mysqlnd-7.4.26-r0 +php7-openssl-7.4.26-r0 +php7-pdo-7.4.26-r0 +php7-pdo_mysql-7.4.26-r0 +php7-pdo_pgsql-7.4.26-r0 +php7-pdo_sqlite-7.4.26-r0 +php7-session-7.4.26-r0 +php7-simplexml-7.4.26-r0 +php7-tokenizer-7.4.26-r0 +php7-xml-7.4.26-r0 +php7-xmlwriter-7.4.26-r0 +php7-zip-7.4.26-r0 +popt-1.18-r0 +procps-3.3.17-r0 +readline-8.1.0-r0 +s6-ipcserver-2.10.0.3-r0 +scanelf-1.3.2-r0 shadow-4.8.1-r0 -sqlite-libs-3.32.1-r1 -ssl_client-1.31.1-r21 -tar-1.32-r2 +skalibs-2.10.0.3-r0 +sqlite-libs-3.35.5-r0 +ssl_client-1.33.1-r6 tzdata-2021e-r0 +utmps-0.1.0.2-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 From 48e2601bb5011880d6faf10e1f9a80599f80d6f4 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 13 Mar 2022 16:34:14 -0400 Subject: [PATCH 216/262] make searchproviders.yaml use configurable --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 0cbb667..475350c 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.03.21:** - Make searchproviders.yaml user configurable. * **11.03.21:** - Rebase to alpine 3.14. * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. * **10.02.21:** - Rebasing to alpine 3.13. diff --git a/readme-vars.yml b/readme-vars.yml index e578ca7..c345964 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." } - { date: "11.03.21:", desc: "Rebase to alpine 3.14." } - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 6a104ef..f8c199c 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -15,6 +15,7 @@ mkdir -p \ 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 && \ + cp /var/www/localhost/heimdall/app/searchproviders.yaml /var/www/localhost/heimdall/app/searchproviders.yaml.orig && \ chown -R abc:abc /var/www/localhost/heimdall # create symlinks @@ -43,6 +44,11 @@ done 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 +# copy searchproviders if not exists and symlink +[[ ! -f /config/www/searchproviders.yaml ]] && \ + cp /var/www/localhost/heimdall/app/searchproviders.yaml.orig /config/www/searchproviders.yaml +rm -rf /var/www/localhost/heimdall/app/searchproviders.yaml +ln -s /config/www/searchproviders.yaml /var/www/localhost/heimdall/app/searchproviders.yaml # set queue driver to database sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env From 67c85fb06a3e6f1e34c21a9310aab146f27b2aa6 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 13 Mar 2022 23:17:16 -0400 Subject: [PATCH 217/262] fix path --- root/etc/cont-init.d/50-config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index f8c199c..c04c31a 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -15,7 +15,7 @@ mkdir -p \ 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 && \ - cp /var/www/localhost/heimdall/app/searchproviders.yaml /var/www/localhost/heimdall/app/searchproviders.yaml.orig && \ + cp /var/www/localhost/heimdall/storage/app/searchproviders.yaml /var/www/localhost/heimdall/storage/app/searchproviders.yaml.orig && \ chown -R abc:abc /var/www/localhost/heimdall # create symlinks @@ -46,9 +46,9 @@ done php /var/www/localhost/heimdall/artisan key:generate # copy searchproviders if not exists and symlink [[ ! -f /config/www/searchproviders.yaml ]] && \ - cp /var/www/localhost/heimdall/app/searchproviders.yaml.orig /config/www/searchproviders.yaml -rm -rf /var/www/localhost/heimdall/app/searchproviders.yaml -ln -s /config/www/searchproviders.yaml /var/www/localhost/heimdall/app/searchproviders.yaml + cp /var/www/localhost/heimdall/storage/app/searchproviders.yaml.orig /config/www/searchproviders.yaml +rm -rf /var/www/localhost/heimdall/storage/app/searchproviders.yaml +ln -s /config/www/searchproviders.yaml /var/www/localhost/heimdall/storage/app/searchproviders.yaml # set queue driver to database sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env From ab1a64efa9db15be33805d70936e5cc1ca8f590f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Mar 2022 12:40:51 +0100 Subject: [PATCH 218/262] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b7ed93f..f345f86 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 -apache2-utils-2.4.52-r0 +apache2-utils-2.4.53-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 @@ -18,7 +18,7 @@ git-2.32.0-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libedit-20210216.3.1-r0 libintl-0.21-r0 @@ -26,13 +26,13 @@ libldap-2.4.58-r0 libmagic-5.40-r1 libpq-13.6-r0 libproc-3.3.17-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 -libssl1.1-1.1.1l-r0 +libssl1.1-1.1.1n-r0 libuuid-2.37.4-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 libzip-1.7.3-r2 linux-pam-1.5.1-r1 logrotate-3.18.1-r1 @@ -44,7 +44,7 @@ ncurses-terminfo-base-6.2_p20210612-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r0 oniguruma-6.9.7.1-r0 -openssl-1.1.1l-r0 +openssl-1.1.1n-r0 pcre-8.44-r0 pcre2-10.36-r0 php7-7.4.26-r0 From 83aad5e6380ee2c581eaf54ee1f13d4464bacb40 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 25 Mar 2022 10:47:37 -0500 Subject: [PATCH 219/262] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f345f86..93e70b6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 argon2-libs-20190702-r1 -bash-5.1.4-r0 +bash-5.1.16-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r6 ca-certificates-20211220-r0 @@ -28,8 +28,8 @@ libpq-13.6-r0 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 -libretls-3.3.3p1-r2 -libsasl-2.1.27-r12 +libretls-3.3.3p1-r3 +libsasl-2.1.28-r0 libssl1.1-1.1.1n-r0 libuuid-2.37.4-r0 libxml2-2.9.13-r0 @@ -76,7 +76,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r6 -tzdata-2021e-r0 +tzdata-2022a-r0 utmps-0.1.0.2-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 From d0ec2ffce46c970e1d801410f7306c105988ca65 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Mar 2022 10:47:53 -0500 Subject: [PATCH 220/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 93e70b6..07490c5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -80,4 +80,4 @@ tzdata-2022a-r0 utmps-0.1.0.2-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 -zlib-1.2.11-r3 +zlib-1.2.12-r0 From 269e3e4912ae7f55d8c33b6bd9f04f2ca6c05bf7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 10 Apr 2022 02:58:11 -0500 Subject: [PATCH 221/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 07490c5..eee36e9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ apr-util-1.6.1-r7 argon2-libs-20190702-r1 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r6 +busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 @@ -75,9 +75,9 @@ scanelf-1.3.2-r0 shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r6 +ssl_client-1.33.1-r7 tzdata-2022a-r0 utmps-0.1.0.2-r0 xz-5.2.5-r0 -xz-libs-5.2.5-r0 +xz-libs-5.2.5-r1 zlib-1.2.12-r0 From 6430e1ca41b940d4af6b8d0fe78c89005b20e3d9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 17 Apr 2022 02:58:28 -0500 Subject: [PATCH 222/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index eee36e9..2835f0a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-8.32-r2 curl-7.79.1-r0 expat-2.4.7-r0 gdbm-1.19-r0 -git-2.32.0-r0 +git-2.32.1-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 @@ -78,6 +78,6 @@ sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r7 tzdata-2022a-r0 utmps-0.1.0.2-r0 -xz-5.2.5-r0 +xz-5.2.5-r1 xz-libs-5.2.5-r1 zlib-1.2.12-r0 From e79167c0467513644ef69ca5bf80502c89f25966 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 1 May 2022 09:57:41 +0200 Subject: [PATCH 223/262] Bot Updating Templated Files --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e4d6f84..d14b6a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -353,9 +353,11 @@ pipeline { if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, removing Unraid template" - git rm unraid/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Removing Deprecated Unraid Template' || : + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From 8bcb1b2e29c1d875850ebc3bf5dd11d665098781 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 1 May 2022 09:58:50 +0200 Subject: [PATCH 224/262] Bot Updating Templated Files --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 475350c..04c1316 100644 --- a/README.md +++ b/README.md @@ -48,26 +48,26 @@ 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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +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) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `lscr.io/linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/heimdall:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: -| Architecture | Tag | -| :----: | --- | -| x86-64 | amd64-latest | -| arm64 | arm64v8-latest | -| armhf | arm32v7-latest | +| Architecture | Available | Tag | +| :----: | :----: | ---- | +| x86-64 | ✅ | amd64-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## Version Tags -This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. +This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags. -| Tag | Description | -| :----: | --- | -| latest | Stable Heimdall releases. | -| development | Latest commit from the github master branch. | +| Tag | Available | Description | +| :----: | :----: |--- | +| latest | ✅ | Stable Heimdall releases. | +| development | ✅ | Latest commit from the github master branch. | ## Application Setup @@ -89,7 +89,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: heimdall: - image: lscr.io/linuxserver/heimdall + image: lscr.io/linuxserver/heimdall:latest container_name: heimdall environment: - PUID=1000 @@ -115,7 +115,7 @@ docker run -d \ -p 443:443 \ -v :/config \ --restart unless-stopped \ - lscr.io/linuxserver/heimdall + lscr.io/linuxserver/heimdall:latest ``` ## Parameters @@ -174,7 +174,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:latest` ## Updating Info @@ -192,7 +192,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/heimdall` +* Update the image: `docker pull lscr.io/linuxserver/heimdall:latest` * Stop the running container: `docker stop heimdall` * Delete the container: `docker rm heimdall` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) From f70722549cff68f212ec336583092de51b34a96b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 1 May 2022 03:01:04 -0500 Subject: [PATCH 225/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2835f0a..6d50fc8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 -curl-7.79.1-r0 +curl-7.79.1-r1 expat-2.4.7-r0 gdbm-1.19-r0 git-2.32.1-r0 @@ -19,7 +19,7 @@ libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1n-r0 -libcurl-7.79.1-r0 +libcurl-7.79.1-r1 libedit-20210216.3.1-r0 libintl-0.21-r0 libldap-2.4.58-r0 From 12494435bafb1f8847bbb5c670994ea3912a5222 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 8 May 2022 09:57:43 +0200 Subject: [PATCH 226/262] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d14b6a0..3b0e56c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -355,7 +355,7 @@ pipeline { if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, marking Unraid template as deprecated" cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml + git add -u unraid/${CONTAINER_NAME}.xml git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : git commit -m 'Bot Moving Deprecated Unraid Template' || : else From 8cf3f05a228bc97c931cf5f5cfd3eeae10860832 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 8 May 2022 09:59:41 +0200 Subject: [PATCH 227/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6d50fc8..484c55a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -42,7 +42,7 @@ nano-5.7-r2 ncurses-libs-6.2_p20210612-r0 ncurses-terminfo-base-6.2_p20210612-r0 nghttp2-libs-1.43.0-r0 -nginx-1.20.2-r0 +nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 openssl-1.1.1n-r0 pcre-8.44-r0 From 85935bca1a856d57e8a3cd1ed960bac26873dbfb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 15 May 2022 02:58:32 -0500 Subject: [PATCH 228/262] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 484c55a..35c29ba 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ git-2.32.1-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1n-r0 +libcrypto1.1-1.1.1o-r0 libcurl-7.79.1-r1 libedit-20210216.3.1-r0 libintl-0.21-r0 @@ -30,9 +30,9 @@ libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 libretls-3.3.3p1-r3 libsasl-2.1.28-r0 -libssl1.1-1.1.1n-r0 +libssl1.1-1.1.1o-r0 libuuid-2.37.4-r0 -libxml2-2.9.13-r0 +libxml2-2.9.14-r0 libzip-1.7.3-r2 linux-pam-1.5.1-r1 logrotate-3.18.1-r1 @@ -44,7 +44,7 @@ ncurses-terminfo-base-6.2_p20210612-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1n-r0 +openssl-1.1.1o-r0 pcre-8.44-r0 pcre2-10.36-r0 php7-7.4.26-r0 @@ -80,4 +80,4 @@ tzdata-2022a-r0 utmps-0.1.0.2-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r0 +zlib-1.2.12-r1 From 7c68367a998d64b4c7a33765a9d76520a401e7ef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 29 May 2022 02:58:18 -0500 Subject: [PATCH 229/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 35c29ba..6264caa 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-8.32-r2 curl-7.79.1-r1 expat-2.4.7-r0 gdbm-1.19-r0 -git-2.32.1-r0 +git-2.32.2-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 From 6afc3aa3b437379fcd73f7012f611ae6fe2c4988 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 5 Jun 2022 09:58:09 +0200 Subject: [PATCH 230/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6264caa..53242cf 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 apache2-utils-2.4.53-r0 apk-tools-2.12.7-r0 -apr-1.7.0-r0 +apr-1.7.0-r1 apr-util-1.6.1-r7 argon2-libs-20190702-r1 bash-5.1.16-r0 @@ -24,7 +24,7 @@ libedit-20210216.3.1-r0 libintl-0.21-r0 libldap-2.4.58-r0 libmagic-5.40-r1 -libpq-13.6-r0 +libpq-13.6-r1 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 From 02bfc31c9ea3a657b83506577e519bd44a91a8e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 12 Jun 2022 02:58:26 -0500 Subject: [PATCH 231/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 53242cf..dc49183 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ libedit-20210216.3.1-r0 libintl-0.21-r0 libldap-2.4.58-r0 libmagic-5.40-r1 -libpq-13.6-r1 +libpq-13.7-r0 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 @@ -35,7 +35,7 @@ libuuid-2.37.4-r0 libxml2-2.9.14-r0 libzip-1.7.3-r2 linux-pam-1.5.1-r1 -logrotate-3.18.1-r1 +logrotate-3.18.1-r2 musl-1.2.2-r3 musl-utils-1.2.2-r3 nano-5.7-r2 From 8fa1b7a5275cc48e7438bb6ba3da5f14b5129a1b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Jun 2022 02:58:03 -0500 Subject: [PATCH 232/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dc49183..39543e1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 -apache2-utils-2.4.53-r0 +apache2-utils-2.4.54-r0 apk-tools-2.12.7-r0 apr-1.7.0-r1 apr-util-1.6.1-r7 @@ -46,7 +46,7 @@ nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 openssl-1.1.1o-r0 pcre-8.44-r0 -pcre2-10.36-r0 +pcre2-10.36-r1 php7-7.4.26-r0 php7-common-7.4.26-r0 php7-ctype-7.4.26-r0 From 88678a056104c6ee712948ac82bfaf3ed75c636d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 26 Jun 2022 09:58:25 +0200 Subject: [PATCH 233/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 39543e1..5a4a900 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,7 +35,7 @@ libuuid-2.37.4-r0 libxml2-2.9.14-r0 libzip-1.7.3-r2 linux-pam-1.5.1-r1 -logrotate-3.18.1-r2 +logrotate-3.18.1-r3 musl-1.2.2-r3 musl-utils-1.2.2-r3 nano-5.7-r2 From 20a43b6ab3bf4299c0ddf7bd9a82d4fb66db2633 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Jul 2022 09:58:21 +0200 Subject: [PATCH 234/262] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5a4a900..d8dddb0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,15 +11,15 @@ busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 -curl-7.79.1-r1 +curl-7.79.1-r2 expat-2.4.7-r0 gdbm-1.19-r0 git-2.32.2-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1o-r0 -libcurl-7.79.1-r1 +libcrypto1.1-1.1.1p-r0 +libcurl-7.79.1-r2 libedit-20210216.3.1-r0 libintl-0.21-r0 libldap-2.4.58-r0 @@ -30,7 +30,7 @@ libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 libretls-3.3.3p1-r3 libsasl-2.1.28-r0 -libssl1.1-1.1.1o-r0 +libssl1.1-1.1.1p-r0 libuuid-2.37.4-r0 libxml2-2.9.14-r0 libzip-1.7.3-r2 From 456545bcc95084bbd7ceea40470a53bb4830eea4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 10 Jul 2022 09:57:51 +0200 Subject: [PATCH 235/262] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d8dddb0..c719626 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ git-2.32.2-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1p-r0 +libcrypto1.1-1.1.1q-r0 libcurl-7.79.1-r2 libedit-20210216.3.1-r0 libintl-0.21-r0 @@ -30,7 +30,7 @@ libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 libretls-3.3.3p1-r3 libsasl-2.1.28-r0 -libssl1.1-1.1.1p-r0 +libssl1.1-1.1.1q-r0 libuuid-2.37.4-r0 libxml2-2.9.14-r0 libzip-1.7.3-r2 @@ -44,7 +44,7 @@ ncurses-terminfo-base-6.2_p20210612-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1o-r0 +openssl-1.1.1q-r0 pcre-8.44-r0 pcre2-10.36-r1 php7-7.4.26-r0 From 4a55c599da442ba67b9d2b2a3696c6a0af94b978 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 17 Jul 2022 02:58:08 -0500 Subject: [PATCH 236/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c719626..53ca5b5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-8.32-r2 curl-7.79.1-r2 expat-2.4.7-r0 gdbm-1.19-r0 -git-2.32.2-r0 +git-2.32.3-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 From a55198f00f0e6115c2dd9f3ec5c5310f928dafbf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 24 Jul 2022 02:58:39 -0500 Subject: [PATCH 237/262] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 53ca5b5..3fb858e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ apr-util-1.6.1-r7 argon2-libs-20190702-r1 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r7 +busybox-1.33.1-r8 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 coreutils-8.32-r2 @@ -39,8 +39,8 @@ logrotate-3.18.1-r3 musl-1.2.2-r3 musl-utils-1.2.2-r3 nano-5.7-r2 -ncurses-libs-6.2_p20210612-r0 -ncurses-terminfo-base-6.2_p20210612-r0 +ncurses-libs-6.2_p20210612-r1 +ncurses-terminfo-base-6.2_p20210612-r1 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 @@ -75,7 +75,7 @@ scanelf-1.3.2-r0 shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r7 +ssl_client-1.33.1-r8 tzdata-2022a-r0 utmps-0.1.0.2-r0 xz-5.2.5-r1 From 723c5aea52694d731e5141c274788054c4fd5a06 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 3 Aug 2022 13:43:27 +0200 Subject: [PATCH 238/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3fb858e..dcb307d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,8 +8,8 @@ argon2-libs-20190702-r1 bash-5.1.16-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r8 -ca-certificates-20211220-r0 -ca-certificates-bundle-20211220-r0 +ca-certificates-20220614-r0 +ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 curl-7.79.1-r2 expat-2.4.7-r0 From c02488e09bd03686d4726da38aa18169681cf628 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 7 Aug 2022 02:57:57 -0500 Subject: [PATCH 239/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index dcb307d..98d8711 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -80,4 +80,4 @@ tzdata-2022a-r0 utmps-0.1.0.2-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r1 +zlib-1.2.12-r2 From 39c59c06a1ea2ab3ab07249c73a165715e13aac5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Aug 2022 09:58:15 +0200 Subject: [PATCH 240/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 98d8711..5dba723 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -80,4 +80,4 @@ tzdata-2022a-r0 utmps-0.1.0.2-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r2 +zlib-1.2.12-r3 From 10c254db2ca1c6d05cbec3314eaeddc662505220 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 14 Oct 2021 16:03:42 -0500 Subject: [PATCH 241/262] Use standard nginx.conf from lsio alpine nginx base image --- Dockerfile | 52 +++++----- Dockerfile.aarch64 | 52 +++++----- Dockerfile.armhf | 52 +++++----- README.md | 6 +- readme-vars.yml | 6 +- root/defaults/default | 43 -------- root/defaults/nginx.conf | 98 ------------------- root/etc/cont-init.d/50-config | 78 ++++++++------- root/etc/services.d/queue/run | 2 +- .../www/localhost/heimdall/public/index.html | 40 ++++++++ 10 files changed, 174 insertions(+), 255 deletions(-) delete mode 100644 root/defaults/default delete mode 100644 root/defaults/nginx.conf create mode 100644 root/var/www/localhost/heimdall/public/index.html diff --git a/Dockerfile b/Dockerfile index 338e877..c73d4c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15 # set version label ARG BUILD_DATE @@ -11,29 +11,33 @@ LABEL maintainer="aptalca" ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ - echo "**** install runtime packages ****" && \ - apk add --no-cache --upgrade \ - curl \ - php7-ctype \ - php7-curl \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pdo_mysql \ - php7-tokenizer \ - php7-zip && \ - echo "**** install heimdall ****" && \ - mkdir -p \ - /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 \ - /heimdall/heimdall.tar.gz -L \ - "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* + echo "**** install runtime packages ****" && \ + apk add --no-cache --upgrade \ + curl \ + php8-ctype \ + php8-curl \ + php8-pdo_pgsql \ + php8-pdo_sqlite \ + php8-pdo_mysql \ + php8-tokenizer \ + php8-zip \ + tar && \ + echo "**** install heimdall ****" && \ + mkdir -p \ + /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 \ + /heimdall/heimdall.tar.gz -L \ + "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* # add local files COPY root/ / + +# ports and volumes +EXPOSE 80 443 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c24893c..715bcab 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15 # set version label ARG BUILD_DATE @@ -11,29 +11,33 @@ LABEL maintainer="aptalca" ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ - echo "**** install runtime packages ****" && \ - apk add --no-cache --upgrade \ - curl \ - php7-ctype \ - php7-curl \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pdo_mysql \ - php7-tokenizer \ - php7-zip && \ - echo "**** install heimdall ****" && \ - mkdir -p \ - /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 \ - /heimdall/heimdall.tar.gz -L \ - "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* + echo "**** install runtime packages ****" && \ + apk add --no-cache --upgrade \ + curl \ + php8-ctype \ + php8-curl \ + php8-pdo_pgsql \ + php8-pdo_sqlite \ + php8-pdo_mysql \ + php8-tokenizer \ + php8-zip \ + tar && \ + echo "**** install heimdall ****" && \ + mkdir -p \ + /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 \ + /heimdall/heimdall.tar.gz -L \ + "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* # add local files COPY root/ / + +# ports and volumes +EXPOSE 80 443 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 92bd786..56589ea 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15 # set version label ARG BUILD_DATE @@ -11,29 +11,33 @@ LABEL maintainer="aptalca" ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 RUN \ - echo "**** install runtime packages ****" && \ - apk add --no-cache --upgrade \ - curl \ - php7-ctype \ - php7-curl \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-pdo_mysql \ - php7-tokenizer \ - php7-zip && \ - echo "**** install heimdall ****" && \ - mkdir -p \ - /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 \ - /heimdall/heimdall.tar.gz -L \ - "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* + echo "**** install runtime packages ****" && \ + apk add --no-cache --upgrade \ + curl \ + php8-ctype \ + php8-curl \ + php8-pdo_pgsql \ + php8-pdo_sqlite \ + php8-pdo_mysql \ + php8-tokenizer \ + php8-zip \ + tar && \ + echo "**** install heimdall ****" && \ + mkdir -p \ + /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 \ + /heimdall/heimdall.tar.gz -L \ + "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* # add local files COPY root/ / + +# ports and volumes +EXPOSE 80 443 diff --git a/README.md b/README.md index 04c1316..ff6d660 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Access the web gui at http://SERVERIP:PORT ### Adding password protection -This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. +This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default.conf` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. ## Usage @@ -240,8 +240,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). * **13.03.21:** - Make searchproviders.yaml user configurable. -* **11.03.21:** - Rebase to alpine 3.14. * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. * **10.02.21:** - Rebasing to alpine 3.13. * **17.08.20:** - Add php7-curl. @@ -264,5 +264,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 * **07.10.18:** - Symlink `.env` rather than copy. It now resides under `/config/www` * **30.09.18:** - Multi-arch image. Move `.env` to `/config`. * **05.09.18:** - Rebase to alpine linux 3.8. -* **06.03.18:** - Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default and restart the container, a new default site config with htpasswd support will be created in its place +* **06.03.18:** - Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default.conf and restart the container, a new default site config with htpasswd support will be created in its place * **12.02.18:** - Initial Release. diff --git a/readme-vars.yml b/readme-vars.yml index c345964..c57a171 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,12 +45,12 @@ app_setup_block: | ### Adding password protection - This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. + This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default.conf` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. # changelog changelogs: + - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." } - - { date: "11.03.21:", desc: "Rebase to alpine 3.14." } - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "17.08.20:", desc: "Add php7-curl." } @@ -73,5 +73,5 @@ changelogs: - { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" } - { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." } - { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." } - - { date: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default and restart the container, a new default site config with htpasswd support will be created in its place" } + - { date: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default.conf and restart the container, a new default site config with htpasswd support will be created in its place" } - { date: "12.02.18:", desc: "Initial Release." } diff --git a/root/defaults/default b/root/defaults/default deleted file mode 100644 index fcf9351..0000000 --- a/root/defaults/default +++ /dev/null @@ -1,43 +0,0 @@ -## Version 2018/03/06 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/default - -server { - listen 80 default_server; - - listen 443 ssl; - - root /var/www/localhost/heimdall/public; - index index.php index.html index.htm; - - server_name _; - - ssl_certificate /config/keys/cert.crt; - ssl_certificate_key /config/keys/cert.key; - - client_max_body_size 0; - - error_page 599 = @noauth; - - location / { - if (!-f /config/nginx/.htpasswd) { - return 599; - } - auth_basic "Restricted"; - auth_basic_user_file /config/nginx/.htpasswd; - try_files $uri $uri/ /index.php?$args; - } - - location @noauth { - try_files $uri $uri/ /index.php?$args; - } - - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - # With php5-cgi alone: - fastcgi_pass 127.0.0.1:9000; - # With php5-fpm: - #fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - - } -} diff --git a/root/defaults/nginx.conf b/root/defaults/nginx.conf deleted file mode 100644 index 70e8488..0000000 --- a/root/defaults/nginx.conf +++ /dev/null @@ -1,98 +0,0 @@ -user abc; -worker_processes 4; -pid /run/nginx.pid; -include /etc/nginx/modules/*.conf; - -events { - worker_connections 768; - # multi_accept on; -} - -http { - - ## - # Basic Settings - ## - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - # server_tokens off; - - # server_names_hash_bucket_size 64; - # server_name_in_redirect off; - - client_max_body_size 0; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - ## - # Logging Settings - ## - - access_log /config/log/nginx/access.log; - error_log /config/log/nginx/error.log; - - ## - # Gzip Settings - ## - - gzip on; - gzip_disable "msie6"; - - # gzip_vary on; - # gzip_proxied any; - # gzip_comp_level 6; - # gzip_buffers 16 8k; - # gzip_http_version 1.1; - # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - - ## - # nginx-naxsi config - ## - # Uncomment it if you installed nginx-naxsi - ## - - #include /etc/nginx/naxsi_core.rules; - - ## - # nginx-passenger config - ## - # Uncomment it if you installed nginx-passenger - ## - - #passenger_root /usr; - #passenger_ruby /usr/bin/ruby; - - ## - # Virtual Host Configs - ## - include /etc/nginx/conf.d/*.conf; - include /config/nginx/site-confs/*; -} - - -#mail { -# # See sample authentication script at: -# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript -# -# # auth_http localhost/auth.php; -# # pop3_capabilities "TOP" "USER"; -# # imap_capabilities "IMAP4rev1" "UIDPLUS"; -# -# server { -# listen localhost:110; -# protocol pop3; -# proxy on; -# } -# -# server { -# listen localhost:143; -# protocol imap; -# proxy on; -# } -#} -daemon off; diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index c04c31a..c30d046 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -2,57 +2,65 @@ # make our folders mkdir -p \ - /config/www/{backgrounds,icons,avatars,SupportedApps} \ - /var/www/localhost/heimdall \ - /config/log/heimdall + /config/www/{backgrounds,icons,avatars,SupportedApps} \ + /app/www \ + /config/log/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 && \ - cp /var/www/localhost/heimdall/storage/app/searchproviders.yaml /var/www/localhost/heimdall/storage/app/searchproviders.yaml.orig && \ - chown -R abc:abc /var/www/localhost/heimdall - +if [[ -f /heimdall/heimdall.tar.gz ]]; then + echo "New container detected, installing Heimdall" + tar xf \ + /heimdall/heimdall.tar.gz -C \ + /app/www --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 + cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig + chown -R abc:abc /app/www +fi # create symlinks symlinks=( \ -/var/www/localhost/heimdall/storage/app/public/avatars \ -/var/www/localhost/heimdall/storage/app/public/backgrounds \ -/var/www/localhost/heimdall/storage/app/public/icons \ -/var/www/localhost/heimdall/app/SupportedApps \ -/var/www/localhost/heimdall/database/app.sqlite \ -/var/www/localhost/heimdall/.env ) +/app/www/storage/app/public/avatars \ +/app/www/storage/app/public/backgrounds \ +/app/www/storage/app/public/icons \ +/app/www/app/SupportedApps \ +/app/www/database/app.sqlite \ +/app/www/.env ) for i in "${symlinks[@]}" do -[[ -e "$i" && ! -L "$i" ]] && rm -rf "$i" -[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i" + if [[ -e "$i" && ! -L "$i" ]]; then + rm -rf "$i" + fi + if [[ ! -L "$i" ]]; then + ln -s /config/www/"$(basename "$i")" "$i" + fi done -[[ -e "/var/www/localhost/heimdall/storage/logs/laravel.log" && ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] \ - && rm -rf "/var/www/localhost/heimdall/storage/logs/laravel.log" -[[ ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] && \ - ln -s "/config/log/heimdall/laravel.log" "/var/www/localhost/heimdall/storage/logs/laravel.log" +if [[ -e "/app/www/storage/logs/laravel.log" && ! -L "/app/www/storage/logs/laravel.log" ]]; then + rm -rf "/app/www/storage/logs/laravel.log" +fi +if [[ ! -L "/app/www/storage/logs/laravel.log" ]]; then + ln -s "/config/log/heimdall/laravel.log" "/app/www/storage/logs/laravel.log" +fi # 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 +if [[ ! -f /config/www/.env ]]; then + cp /app/www/.env.example /config/www/.env + echo "Creating app key. This may take a while on slower systems" + php /app/www/artisan key:generate +fi # copy searchproviders if not exists and symlink -[[ ! -f /config/www/searchproviders.yaml ]] && \ - cp /var/www/localhost/heimdall/storage/app/searchproviders.yaml.orig /config/www/searchproviders.yaml -rm -rf /var/www/localhost/heimdall/storage/app/searchproviders.yaml -ln -s /config/www/searchproviders.yaml /var/www/localhost/heimdall/storage/app/searchproviders.yaml +if [[ ! -f /config/www/searchproviders.yaml ]]; then + cp /app/www/storage/app/searchproviders.yaml.orig /config/www/searchproviders.yaml +fi +rm -rf /app/www/storage/app/searchproviders.yaml +ln -s /config/www/searchproviders.yaml /app/www/storage/app/searchproviders.yaml # 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 + /config diff --git a/root/etc/services.d/queue/run b/root/etc/services.d/queue/run index 5fbc6b3..99b3fbf 100644 --- a/root/etc/services.d/queue/run +++ b/root/etc/services.d/queue/run @@ -1,4 +1,4 @@ #!/usr/bin/with-contenv bash exec \ - s6-setuidgid abc php /var/www/localhost/heimdall/artisan queue:work database --sleep=3 --tries=3 + s6-setuidgid abc php /app/www/artisan queue:work database --sleep=3 --tries=3 diff --git a/root/var/www/localhost/heimdall/public/index.html b/root/var/www/localhost/heimdall/public/index.html new file mode 100644 index 0000000..2ac31be --- /dev/null +++ b/root/var/www/localhost/heimdall/public/index.html @@ -0,0 +1,40 @@ + + + Upgrade Required! + + + +
+

Upgrade Required!

+

The application inside this image has been moved to a new folder.

+

You will need to update your /config/nginx/nginx.conf and /config/nginx/site-confs/default.conf in order for the application to work.

+

New config samples are located at /config/nginx/nginx.conf.sample and /config/nginx/site-confs/default.conf.sample

+

Please review our announcement: Significant changes to nginx based images

+
+ + From b5f15e143643a81de521560d1712e60f4b42a946 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 20 Aug 2022 18:54:29 -0500 Subject: [PATCH 242/262] Add default location migration --- root/migrations/02-default-location | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 root/migrations/02-default-location diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location new file mode 100644 index 0000000..d700b7f --- /dev/null +++ b/root/migrations/02-default-location @@ -0,0 +1,10 @@ +#!/usr/bin/with-contenv bash + +DEFAULT_CONF="/config/nginx/site-confs/default.conf" +OLD_ROOT="root /var/www/localhost/heimdall/public;" +NEW_ROOT="root /app/www/public;" + +if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then + echo "updating root in ${DEFAULT_CONF}" + sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" +fi From 3ed7a3d71c4c0a974be95fd5c9fad5f895d399a4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Aug 2022 02:58:20 -0500 Subject: [PATCH 243/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 5dba723..3ccb547 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ libedit-20210216.3.1-r0 libintl-0.21-r0 libldap-2.4.58-r0 libmagic-5.40-r1 -libpq-13.7-r0 +libpq-13.8-r0 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 From 98407a0b20dc366cbdb9d68e2e3cab5c65db7e77 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 21 Aug 2022 16:54:02 -0500 Subject: [PATCH 244/262] Keep /config volume consistently --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index c73d4c1..4dd15a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,3 +41,4 @@ COPY root/ / # ports and volumes EXPOSE 80 443 +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 715bcab..59ffe3b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -41,3 +41,4 @@ COPY root/ / # ports and volumes EXPOSE 80 443 +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 56589ea..a4afe33 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -41,3 +41,4 @@ COPY root/ / # ports and volumes EXPOSE 80 443 +VOLUME /config From 58857e1645890acabd6104adf5c95359847d2898 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 23 Aug 2022 10:06:53 -0500 Subject: [PATCH 245/262] Update readme --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ff6d660..4582562 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Access the web gui at http://SERVERIP:PORT ### Adding password protection -This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default.conf` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. +This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container. ## Usage diff --git a/readme-vars.yml b/readme-vars.yml index c57a171..f32b656 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,7 +45,7 @@ app_setup_block: | ### Adding password protection - This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. New installs will automatically pick it up and implement password protected access. Existing users updating their image can delete their site config at `/config/nginx/site-confs/default.conf` and restart the container after updating the image. A new site config with htpasswd support will be created in its place. + This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd `. Replace with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container. # changelog changelogs: From 5cf14aca3deacbfbc911ef47736e2b1204cd9115 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Aug 2022 09:58:06 +0200 Subject: [PATCH 246/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3ccb547..e16d532 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -32,7 +32,7 @@ libretls-3.3.3p1-r3 libsasl-2.1.28-r0 libssl1.1-1.1.1q-r0 libuuid-2.37.4-r0 -libxml2-2.9.14-r0 +libxml2-2.9.14-r1 libzip-1.7.3-r2 linux-pam-1.5.1-r1 logrotate-3.18.1-r3 @@ -76,7 +76,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r8 -tzdata-2022a-r0 +tzdata-2022c-r0 utmps-0.1.0.2-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 From 661cac879efeeba52b9f9cbeb920f118776699e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Sep 2022 09:58:19 +0200 Subject: [PATCH 247/262] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e16d532..274d427 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ busybox-1.33.1-r8 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 -curl-7.79.1-r2 +curl-7.79.1-r3 expat-2.4.7-r0 gdbm-1.19-r0 git-2.32.3-r0 @@ -19,7 +19,7 @@ libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1q-r0 -libcurl-7.79.1-r2 +libcurl-7.79.1-r3 libedit-20210216.3.1-r0 libintl-0.21-r0 libldap-2.4.58-r0 From b5b6a14b767e22cfab73bb812dd9fe0348f62ff7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Sep 2022 09:57:54 +0200 Subject: [PATCH 248/262] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b0e56c..9238443 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -720,7 +720,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } From 06916de7661221e9dd19825f22620f2c80a53e3b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 18 Sep 2022 10:00:10 +0200 Subject: [PATCH 249/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 274d427..aad4f74 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -35,7 +35,7 @@ libuuid-2.37.4-r0 libxml2-2.9.14-r1 libzip-1.7.3-r2 linux-pam-1.5.1-r1 -logrotate-3.18.1-r3 +logrotate-3.18.1-r4 musl-1.2.2-r3 musl-utils-1.2.2-r3 nano-5.7-r2 From a0dc297a6223aa2be83eb7ca0e6ba897f3c1739f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 25 Sep 2022 02:58:15 -0500 Subject: [PATCH 250/262] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index aad4f74..dd037ae 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 curl-7.79.1-r3 -expat-2.4.7-r0 +expat-2.4.9-r0 gdbm-1.19-r0 git-2.32.3-r0 libacl-2.2.53-r0 From 3330a74e44c817bf6013303d23cf19b683d27b8c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 23 Oct 2022 09:59:12 +0200 Subject: [PATCH 251/262] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dd037ae..2544a06 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-8.32-r2 curl-7.79.1-r3 expat-2.4.9-r0 gdbm-1.19-r0 -git-2.32.3-r0 +git-2.32.4-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 @@ -32,7 +32,7 @@ libretls-3.3.3p1-r3 libsasl-2.1.28-r0 libssl1.1-1.1.1q-r0 libuuid-2.37.4-r0 -libxml2-2.9.14-r1 +libxml2-2.9.14-r2 libzip-1.7.3-r2 linux-pam-1.5.1-r1 logrotate-3.18.1-r4 @@ -48,25 +48,25 @@ openssl-1.1.1q-r0 pcre-8.44-r0 pcre2-10.36-r1 php7-7.4.26-r0 -php7-common-7.4.26-r0 -php7-ctype-7.4.26-r0 -php7-curl-7.4.26-r0 +php7-common-7.4.32-r0 +php7-ctype-7.4.32-r0 +php7-curl-7.4.32-r0 php7-fileinfo-7.4.26-r0 php7-fpm-7.4.26-r0 php7-json-7.4.26-r0 php7-mbstring-7.4.26-r0 -php7-mysqlnd-7.4.26-r0 -php7-openssl-7.4.26-r0 -php7-pdo-7.4.26-r0 -php7-pdo_mysql-7.4.26-r0 -php7-pdo_pgsql-7.4.26-r0 -php7-pdo_sqlite-7.4.26-r0 +php7-mysqlnd-7.4.32-r0 +php7-openssl-7.4.32-r0 +php7-pdo-7.4.32-r0 +php7-pdo_mysql-7.4.32-r0 +php7-pdo_pgsql-7.4.32-r0 +php7-pdo_sqlite-7.4.32-r0 php7-session-7.4.26-r0 php7-simplexml-7.4.26-r0 -php7-tokenizer-7.4.26-r0 +php7-tokenizer-7.4.32-r0 php7-xml-7.4.26-r0 php7-xmlwriter-7.4.26-r0 -php7-zip-7.4.26-r0 +php7-zip-7.4.32-r0 popt-1.18-r0 procps-3.3.17-r0 readline-8.1.0-r0 From dd38966ea33e59bf15b1d7f934950ed5d91f8524 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 30 Oct 2022 02:58:24 -0500 Subject: [PATCH 252/262] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2544a06..2742e42 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 curl-7.79.1-r3 -expat-2.4.9-r0 +expat-2.5.0-r0 gdbm-1.19-r0 git-2.32.4-r0 libacl-2.2.53-r0 @@ -47,25 +47,25 @@ oniguruma-6.9.7.1-r0 openssl-1.1.1q-r0 pcre-8.44-r0 pcre2-10.36-r1 -php7-7.4.26-r0 +php7-7.4.32-r0 php7-common-7.4.32-r0 php7-ctype-7.4.32-r0 php7-curl-7.4.32-r0 -php7-fileinfo-7.4.26-r0 -php7-fpm-7.4.26-r0 -php7-json-7.4.26-r0 -php7-mbstring-7.4.26-r0 +php7-fileinfo-7.4.32-r0 +php7-fpm-7.4.32-r0 +php7-json-7.4.32-r0 +php7-mbstring-7.4.32-r0 php7-mysqlnd-7.4.32-r0 php7-openssl-7.4.32-r0 php7-pdo-7.4.32-r0 php7-pdo_mysql-7.4.32-r0 php7-pdo_pgsql-7.4.32-r0 php7-pdo_sqlite-7.4.32-r0 -php7-session-7.4.26-r0 -php7-simplexml-7.4.26-r0 +php7-session-7.4.32-r0 +php7-simplexml-7.4.32-r0 php7-tokenizer-7.4.32-r0 -php7-xml-7.4.26-r0 -php7-xmlwriter-7.4.26-r0 +php7-xml-7.4.32-r0 +php7-xmlwriter-7.4.32-r0 php7-zip-7.4.32-r0 popt-1.18-r0 procps-3.3.17-r0 From 40d7d7473c0cf90fad415634c76708442f7e30cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Nov 2022 18:01:11 +0100 Subject: [PATCH 253/262] Bot Updating Package Versions --- package_versions.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2742e42..b868c06 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ git-2.32.4-r0 libacl-2.2.53-r0 libattr-2.5.1-r0 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1q-r0 +libcrypto1.1-1.1.1s-r0 libcurl-7.79.1-r3 libedit-20210216.3.1-r0 libintl-0.21-r0 @@ -30,7 +30,7 @@ libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 libretls-3.3.3p1-r3 libsasl-2.1.28-r0 -libssl1.1-1.1.1q-r0 +libssl1.1-1.1.1s-r0 libuuid-2.37.4-r0 libxml2-2.9.14-r2 libzip-1.7.3-r2 @@ -44,29 +44,29 @@ ncurses-terminfo-base-6.2_p20210612-r1 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1q-r0 +openssl-1.1.1s-r0 pcre-8.44-r0 pcre2-10.36-r1 php7-7.4.32-r0 -php7-common-7.4.32-r0 -php7-ctype-7.4.32-r0 -php7-curl-7.4.32-r0 +php7-common-7.4.33-r0 +php7-ctype-7.4.33-r0 +php7-curl-7.4.33-r0 php7-fileinfo-7.4.32-r0 php7-fpm-7.4.32-r0 php7-json-7.4.32-r0 php7-mbstring-7.4.32-r0 -php7-mysqlnd-7.4.32-r0 -php7-openssl-7.4.32-r0 -php7-pdo-7.4.32-r0 -php7-pdo_mysql-7.4.32-r0 -php7-pdo_pgsql-7.4.32-r0 -php7-pdo_sqlite-7.4.32-r0 +php7-mysqlnd-7.4.33-r0 +php7-openssl-7.4.33-r0 +php7-pdo-7.4.33-r0 +php7-pdo_mysql-7.4.33-r0 +php7-pdo_pgsql-7.4.33-r0 +php7-pdo_sqlite-7.4.33-r0 php7-session-7.4.32-r0 php7-simplexml-7.4.32-r0 -php7-tokenizer-7.4.32-r0 +php7-tokenizer-7.4.33-r0 php7-xml-7.4.32-r0 php7-xmlwriter-7.4.32-r0 -php7-zip-7.4.32-r0 +php7-zip-7.4.33-r0 popt-1.18-r0 procps-3.3.17-r0 readline-8.1.0-r0 From 12b30e60e68a70da40910bb64c6aa1b46578a0e5 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 4 Nov 2022 15:50:23 -0400 Subject: [PATCH 254/262] change upstream branch to 2.x --- Jenkinsfile | 2 +- README.md | 3 ++- jenkins-vars.yml | 2 +- readme-vars.yml | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9238443..e6df508 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') SCARF_TOKEN=credentials('scarf_api_key') - EXT_GIT_BRANCH = 'master' + EXT_GIT_BRANCH = '2.x' EXT_USER = 'linuxserver' EXT_REPO = 'Heimdall' CONTAINER_NAME = 'heimdall' diff --git a/README.md b/README.md index 04c1316..4c6ff87 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ This image provides various versions that are available via tags. Please read th | Tag | Available | Description | | :----: | :----: |--- | | latest | ✅ | Stable Heimdall releases. | -| development | ✅ | Latest commit from the github master branch. | +| development | ✅ | Latest commit from the github 2.x branch. | ## Application Setup @@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag. * **13.03.21:** - Make searchproviders.yaml user configurable. * **11.03.21:** - Rebase to alpine 3.14. * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 6bae949..cc91838 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,7 @@ release_type: stable release_tag: latest ls_branch: master repo_vars: - - EXT_GIT_BRANCH = 'master' + - EXT_GIT_BRANCH = '2.x' - EXT_USER = 'linuxserver' - EXT_REPO = 'Heimdall' - CONTAINER_NAME = 'heimdall' diff --git a/readme-vars.yml b/readme-vars.yml index c345964..0c1ea42 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -21,7 +21,7 @@ available_architectures: development_versions: true development_versions_items: - { tag: "latest", desc: "Stable Heimdall releases." } - - { tag: "development", desc: "Latest commit from the github master branch." } + - { tag: "development", desc: "Latest commit from the github 2.x branch." } # container parameters common_param_env_vars_enabled: true @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag." } - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." } - { date: "11.03.21:", desc: "Rebase to alpine 3.14." } - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." } From be02445f7c20b217a6c74376e6a218603c8fd841 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 4 Nov 2022 15:51:33 -0400 Subject: [PATCH 255/262] update readme --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 0c1ea42..8ccb539 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -28,7 +28,7 @@ common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Contains all relevant configuration files." } + - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." } param_usage_include_ports: true param_ports: - { external_port: "80", internal_port: "80", port_desc: "http gui" } From 5c439758c4019255651ee133380b01c7f177c842 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Nov 2022 20:20:11 +0100 Subject: [PATCH 256/262] Bot Updating Templated Files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c6ff87..2f1f184 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ services: - PGID=1000 - TZ=Europe/London volumes: - - :/config + - /path/to/appdata/config:/config ports: - 80:80 - 443:443 @@ -113,7 +113,7 @@ docker run -d \ -e TZ=Europe/London \ -p 80:80 \ -p 443:443 \ - -v :/config \ + -v /path/to/appdata/config:/config \ --restart unless-stopped \ lscr.io/linuxserver/heimdall:latest ``` From a9828f41b4e35e9b0c7719868b6838df5a05be8c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Nov 2022 08:57:49 +0100 Subject: [PATCH 257/262] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index ff60506..de187cf 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,8 +48,12 @@ jobs: | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/blobs/${digest}" \ - | jq -r '.container_config') + "https://ghcr.io/v2/${image}/blobs/${digest}") + if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then + image_info=$(echo $image_info | jq -r '.config') + else + image_info=$(echo $image_info | jq -r '.container_config') + fi IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then From 55a99e5fe5886ec5d3d19e84749f7269a2c6d7ed Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Nov 2022 09:00:11 +0100 Subject: [PATCH 258/262] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b868c06..009d3b3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -47,25 +47,25 @@ oniguruma-6.9.7.1-r0 openssl-1.1.1s-r0 pcre-8.44-r0 pcre2-10.36-r1 -php7-7.4.32-r0 +php7-7.4.33-r0 php7-common-7.4.33-r0 php7-ctype-7.4.33-r0 php7-curl-7.4.33-r0 -php7-fileinfo-7.4.32-r0 -php7-fpm-7.4.32-r0 -php7-json-7.4.32-r0 -php7-mbstring-7.4.32-r0 +php7-fileinfo-7.4.33-r0 +php7-fpm-7.4.33-r0 +php7-json-7.4.33-r0 +php7-mbstring-7.4.33-r0 php7-mysqlnd-7.4.33-r0 php7-openssl-7.4.33-r0 php7-pdo-7.4.33-r0 php7-pdo_mysql-7.4.33-r0 php7-pdo_pgsql-7.4.33-r0 php7-pdo_sqlite-7.4.33-r0 -php7-session-7.4.32-r0 -php7-simplexml-7.4.32-r0 +php7-session-7.4.33-r0 +php7-simplexml-7.4.33-r0 php7-tokenizer-7.4.33-r0 -php7-xml-7.4.32-r0 -php7-xmlwriter-7.4.32-r0 +php7-xml-7.4.33-r0 +php7-xmlwriter-7.4.33-r0 php7-zip-7.4.33-r0 popt-1.18-r0 procps-3.3.17-r0 @@ -76,7 +76,7 @@ shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r8 -tzdata-2022c-r0 +tzdata-2022f-r1 utmps-0.1.0.2-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 From 5b4cf6dc3b8c5bd761d8b938c873aa0b6210d894 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 14 Nov 2022 21:15:25 +0000 Subject: [PATCH 259/262] Don't error when migration file doesn't exist --- root/migrations/02-default-location | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location index d700b7f..d4119eb 100644 --- a/root/migrations/02-default-location +++ b/root/migrations/02-default-location @@ -4,7 +4,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf" OLD_ROOT="root /var/www/localhost/heimdall/public;" NEW_ROOT="root /app/www/public;" -if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then +if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then echo "updating root in ${DEFAULT_CONF}" sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" fi From fb1014c8fd2491b2198de91ff3393aca1a935906 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 14 Nov 2022 21:16:04 +0000 Subject: [PATCH 260/262] Include default.conf Don't include =404 in try_files --- .../nginx/site-confs/default.conf.sample | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 root/defaults/nginx/site-confs/default.conf.sample diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample new file mode 100644 index 0000000..edc67f3 --- /dev/null +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -0,0 +1,34 @@ +## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample + +server { + listen 80 default_server; + listen [::]:80 default_server; + + listen 443 ssl http2 default_server; + listen [::]:443 ssl http2 default_server; + + server_name _; + + root /app/www/public; + index index.html index.htm index.php; + + location / { + # enable for basic auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + try_files $uri $uri/ /index.html /index.php$is_args$args; + } + + location ~ ^(.+\.php)(.*)$ { + fastcgi_split_path_info ^(.+\.php)(.*)$; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + + # deny access to .htaccess/.htpasswd files + location ~ /\.ht { + deny all; + } +} From c7992939d74b69ce028a76976b79987873c4a05f Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 14 Nov 2022 21:21:08 +0000 Subject: [PATCH 261/262] Fix default.conf date --- root/defaults/nginx/site-confs/default.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index edc67f3..22ca85a 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2022/11/14 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; From 5e59fa3aa214724c5f4c8bfe5947f8443f09fe3c Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 14 Nov 2022 21:44:23 +0000 Subject: [PATCH 262/262] Add php8-intl --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4dd15a5..2196102 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN \ curl \ php8-ctype \ php8-curl \ + php8-intl \ php8-pdo_pgsql \ php8-pdo_sqlite \ php8-pdo_mysql \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 59ffe3b..a18fb82 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,6 +16,7 @@ RUN \ curl \ php8-ctype \ php8-curl \ + php8-intl \ php8-pdo_pgsql \ php8-pdo_sqlite \ php8-pdo_mysql \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a4afe33..abac25a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -16,6 +16,7 @@ RUN \ curl \ php8-ctype \ php8-curl \ + php8-intl \ php8-pdo_pgsql \ php8-pdo_sqlite \ php8-pdo_mysql \