From 39c59c06a1ea2ab3ab07249c73a165715e13aac5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 14 Aug 2022 09:58:15 +0200 Subject: [PATCH 01/15] 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 3ed7a3d71c4c0a974be95fd5c9fad5f895d399a4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Aug 2022 02:58:20 -0500 Subject: [PATCH 02/15] 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 5cf14aca3deacbfbc911ef47736e2b1204cd9115 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 28 Aug 2022 09:58:06 +0200 Subject: [PATCH 03/15] 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 04/15] 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 05/15] 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 06/15] 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 07/15] 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 08/15] 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 09/15] 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 10/15] 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 11/15] 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 12/15] 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 13/15] 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 14/15] 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 15/15] 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