From 9814d9b061d5edc57b5e0c1cb0cc39d87714a5d9 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 18:08:48 -0600 Subject: [PATCH 1/3] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- readme-vars.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2dc2c7d..5d3f5b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 79f6727..8afd7a0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index 4308ab9..c8a55b4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -32,6 +32,7 @@ app_setup_block: | Access the web gui at http://SERVERIP:PORT # changelog changelogs: + - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "29.11.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3." } From 13008c579bfbf826a1804b36df73771b2036c2a2 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 6 Mar 2024 10:07:35 -0500 Subject: [PATCH 2/3] update changelog --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index c8a55b4..592ca1a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -32,7 +32,7 @@ app_setup_block: | Access the web gui at http://SERVERIP:PORT # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} + - { 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." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "29.11.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3." } From 93b0501b14bcedb79eee9a2c5c7243d2b3be56a5 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 6 Mar 2024 10:21:43 -0500 Subject: [PATCH 3/3] reduce ci delay --- jenkins-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c7d3069..4ff21d3 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,7 +24,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='80' - CI_SSL='' - - CI_DELAY='500' + - CI_DELAY='60' - CI_DOCKERENV='TZ=America/New_York' - CI_AUTH='' - CI_WEBPATH=''