From 62361ec5374ea3d211734875d61c4c5098794fb0 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 24 Jun 2024 19:00:13 +0100 Subject: [PATCH 1/2] Rebase to 3.20 --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 5 +---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6841662..54df86b 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 @@ -37,6 +37,7 @@ RUN \ cd /app/www/public && \ composer \ install --no-dev --optimize-autoloader && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /root/.composer \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0952d07..5e2377a 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 @@ -38,6 +38,7 @@ RUN \ # use standard composer 2.x now, no need to install older 1.x version composer \ install --no-dev --optimize-autoloader && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /root/.composer \ diff --git a/Jenkinsfile b/Jenkinsfile index 2e0bc3c..c6e975c 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 a3ff842..76d5eb6 100644 --- a/README.md +++ b/README.md @@ -310,6 +310,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.06.24:** - Rebase to Alpine 3.20. * **07.05.24:** - Existing users should verify: site-confs/default.conf - Fix rewriting rules default site conf. * **20.03.24:** - Rebase to Alpine 3.19. * **25.12.23:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 98decab..278bd48 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,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 41ef22d..930434e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -39,16 +39,12 @@ project_blurb: | If you want to use the OPDS feed don't forget to specify feed.php at the end of your URL. project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false # supported architectures available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false - # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" @@ -70,6 +66,7 @@ app_setup_block: | # changelog changelogs: + - { date: "24.06.24:", desc: "Rebase to Alpine 3.20." } - { date: "07.05.24:", desc: "Existing users should verify: site-confs/default.conf - Fix rewriting rules default site conf." } - { date: "20.03.24:", desc: "Rebase to Alpine 3.19." } - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } From 6b2cdd4c6fbbc6c097c1433d8cae1d366d253040 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 24 Jun 2024 19:47:26 +0100 Subject: [PATCH 2/2] Update nginx config --- readme-vars.yml | 2 +- root/defaults/nginx/site-confs/default.conf.sample | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 930434e..f5ed77f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -66,7 +66,7 @@ app_setup_block: | # changelog changelogs: - - { date: "24.06.24:", desc: "Rebase to Alpine 3.20." } + - { date: "24.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings." } - { date: "07.05.24:", desc: "Existing users should verify: site-confs/default.conf - Fix rewriting rules default site conf." } - { date: "20.03.24:", desc: "Rebase to Alpine 3.19." } - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 03f256f..33c4078 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/05/07 - Changelog: https://github.com/linuxserver/docker-cops/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/06/24 - Changelog: https://github.com/linuxserver/docker-cops/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 _;