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 diff --git a/Jenkinsfile b/Jenkinsfile index 3b0e56c..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' @@ -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''' } } } diff --git a/README.md b/README.md index 4582562..0574b3d 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 @@ -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 ``` @@ -240,7 +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)). +* **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). +* **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag. * **13.03.21:** - Make searchproviders.yaml user configurable. * **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/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/package_versions.txt b/package_versions.txt index 98d8711..009d3b3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,31 +11,31 @@ busybox-1.33.1-r8 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-8.32-r2 -curl-7.79.1-r2 -expat-2.4.7-r0 +curl-7.79.1-r3 +expat-2.5.0-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 -libcrypto1.1-1.1.1q-r0 -libcurl-7.79.1-r2 +libcrypto1.1-1.1.1s-r0 +libcurl-7.79.1-r3 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 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-r0 +libxml2-2.9.14-r2 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 @@ -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.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 +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.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.33-r0 +php7-simplexml-7.4.33-r0 +php7-tokenizer-7.4.33-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 readline-8.1.0-r0 @@ -76,8 +76,8 @@ 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-2022f-r1 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 diff --git a/readme-vars.yml b/readme-vars.yml index f32b656..c69fa69 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -21,14 +21,14 @@ 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 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" } @@ -49,7 +49,8 @@ app_setup_block: | # 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: "14.11.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: "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: "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." }