From 7bce52ebf41f8af70eefb0ce667c0a72801d5467 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 6 Jun 2024 17:49:16 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 8 ++++---- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 3 +-- readme-vars.yml | 4 +--- root/defaults/nginx/site-confs/default.conf.sample | 9 +++------ 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d3f5b5..1514097 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 @@ -16,7 +16,6 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \ - musl-dev \ python3 && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ @@ -33,7 +32,7 @@ RUN \ /tmp/budge.tar.gz -L \ "https://github.com/linuxserver/budge/archive/${BUDGE_RELEASE}.tar.gz" && \ tar xf \ - /tmp/budge.tar.gz -C \ + /tmp/budge.tar.gz -C \ /app/www/public/ --strip-components=1 && \ echo "**** install backend ****" && \ cd /app/www/public/backend && \ @@ -49,8 +48,9 @@ RUN \ npm run build && \ npm prune --omit=dev && \ echo "**** overlay-fs bug workaround ****" && \ - mv /app/www/public/frontend/node_modules /app/www/public/frontend/node_modules-tmp && \ + mv /app/www/public/frontend/node_modules /app/www/public/frontend/node_modules-tmp && \ mv /app/www/public/backend/node_modules /app/www/public/backend/node_modules-tmp && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ npm cache clean --force && \ apk del --purge \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8afd7a0..300a24f 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 @@ -16,7 +16,6 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \ - musl-dev \ python3 && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ @@ -33,7 +32,7 @@ RUN \ /tmp/budge.tar.gz -L \ "https://github.com/linuxserver/budge/archive/${BUDGE_RELEASE}.tar.gz" && \ tar xf \ - /tmp/budge.tar.gz -C \ + /tmp/budge.tar.gz -C \ /app/www/public/ --strip-components=1 && \ echo "**** install backend ****" && \ cd /app/www/public/backend && \ @@ -49,8 +48,9 @@ RUN \ npm run build && \ npm prune --omit=dev && \ echo "**** overlay-fs bug workaround ****" && \ - mv /app/www/public/frontend/node_modules /app/www/public/frontend/node_modules-tmp && \ + mv /app/www/public/frontend/node_modules /app/www/public/frontend/node_modules-tmp && \ mv /app/www/public/backend/node_modules /app/www/public/backend/node_modules-tmp && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ npm cache clean --force && \ apk del --purge \ diff --git a/Jenkinsfile b/Jenkinsfile index 2dfa984..a769caf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { CI_PORT='80' CI_SSL='' CI_DELAY='60' - CI_DOCKERENV='TZ=America/New_York' + CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='' } diff --git a/README.md b/README.md index 5dd8764..745283b 100644 --- a/README.md +++ b/README.md @@ -274,6 +274,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **06.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **06.03.24:** - Rebase to Alpine 3.19 with php 8.3. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 4ff21d3..caf598f 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: main -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'main' - EXT_USER = 'linuxserver' @@ -25,6 +24,6 @@ repo_vars: - CI_PORT='80' - CI_SSL='' - CI_DELAY='60' - - CI_DOCKERENV='TZ=America/New_York' + - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 7e50326..50bb6a9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -22,9 +22,6 @@ 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: "America/New_York", desc: "Specify a timezone to use EG America/New_York"} # application setup block app_setup_block_enabled: true @@ -32,6 +29,7 @@ app_setup_block: | Access the web gui at http://SERVERIP:PORT # changelog changelogs: + - { date: "06.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 156e7d2..01ebf90 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-budge/commits/main/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/06/06 - Changelog: https://github.com/linuxserver/docker-budge/commits/main/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 _;