From 3f23522949f0605dbfb3db95b2c6ded9d9b80b32 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 27 Jun 2024 16:29:44 +0100 Subject: [PATCH 1/2] Rebase to 3.20 --- Dockerfile | 6 ++---- Dockerfile.aarch64 | 6 ++---- Jenkinsfile | 4 ++-- README.md | 2 +- jenkins-vars.yml | 5 ++--- readme-vars.yml | 16 ++-------------- .../nginx/site-confs/default.conf.sample | 9 +++------ root/etc/s6-overlay/s6-rc.d/svc-queue/run | 1 + root/migrations/02-default-location | 0 9 files changed, 15 insertions(+), 34 deletions(-) mode change 100644 => 100755 root/migrations/02-default-location diff --git a/Dockerfile b/Dockerfile index 3df2f6d..85cdbf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 # set version label ARG BUILD_DATE @@ -9,9 +9,6 @@ ARG HEIMDALL_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="aptalca" -# environment settings -ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 - RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ @@ -45,6 +42,7 @@ RUN \ tar xf \ /tmp/heimdall.tar.gz -C \ /app/www-tmp --strip-components=1 && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d7416c2..e1fc0ea 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -9,9 +9,6 @@ ARG HEIMDALL_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="aptalca" -# environment settings -ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 - RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ @@ -45,6 +42,7 @@ RUN \ tar xf \ /tmp/heimdall.tar.gz -C \ /app/www-tmp --strip-components=1 && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Jenkinsfile b/Jenkinsfile index 775ecf2..2257a8e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='80' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 4aa1892..18776bc 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,6 @@ This image provides various versions that are available via tags. Please read th 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. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container. @@ -292,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **07.03.24:** - Enable the opcache and disable file revalidation. * **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f8be5f8..a0ca4e7 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_commit release_type: prerelease release_tag: development ls_branch: development -build_armhf: false repo_vars: - EXT_GIT_BRANCH = '2.x' - EXT_USER = 'linuxserver' @@ -25,6 +24,6 @@ repo_vars: - CI_PORT='80' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 91ec9e2..dd96b80 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,31 +33,19 @@ param_usage_include_ports: true param_ports: - { external_port: "80", internal_port: "80", port_desc: "http gui" } - { external_port: "443", internal_port: "443", port_desc: "https gui" } -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: false -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: | 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. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container. # changelog changelogs: + - { date: "27.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."} - { date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 145a547..0eb9af1 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,11 +1,8 @@ -## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/06/27 - 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; + listen *:80 default_server; + listen *:443 ssl default_server; server_name _; diff --git a/root/etc/s6-overlay/s6-rc.d/svc-queue/run b/root/etc/s6-overlay/s6-rc.d/svc-queue/run index 99b3fbf..8b7226f 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-queue/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-queue/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash exec \ s6-setuidgid abc php /app/www/artisan queue:work database --sleep=3 --tries=3 diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location old mode 100644 new mode 100755 From ab650ac00699711415c7738442df902e0086980d Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 27 Jun 2024 16:30:37 +0100 Subject: [PATCH 2/2] Add missing shellcheck format --- root/migrations/02-default-location | 1 + 1 file changed, 1 insertion(+) diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location index 7d46d8c..2c7603e 100755 --- a/root/migrations/02-default-location +++ b/root/migrations/02-default-location @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash DEFAULT_CONF="/config/nginx/site-confs/default.conf" OLD_ROOT="root /var/www/localhost/heimdall/public;"