From 6a7ab21c1b6de362213d5d7173315646a73e0fd7 Mon Sep 17 00:00:00 2001 From: Nicolas CARPi Date: Fri, 20 Sep 2024 13:23:57 +0200 Subject: [PATCH] update s6-overlay --- CHANGELOG.md | 5 +++++ Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49a3b2e..3496f56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Container image version # Note: the version here is from `ELABIMG_VERSION` present in Dockerfile, not the tagged one +# 5.3.0 + +* Update s6-overlay to 3.2.0.0 +* Move `MAX_UPLOAD_SIZE` and `MAX_UPLOAD_TIME` into PHP env instead of build args + # 5.2.0 * Update base image to Alpine 3.19 diff --git a/Dockerfile b/Dockerfile index df224b2..6fd9df9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -151,7 +151,7 @@ RUN abuild && find /home/builder/packages -type f -name 'cronie-1*.apk' -exec mv FROM alpine:3.19 # this is versioning for the container image -ENV ELABIMG_VERSION=5.2.0 +ENV ELABIMG_VERSION=5.3.0 # the target elabftw version is passed with --build-arg # it is a mandatory ARG @@ -236,7 +236,7 @@ RUN ln /usr/bin/php83 /usr/bin/php # S6-OVERLAY # install s6-overlay, our init system. Workaround for different versions using TARGETPLATFORM # platform see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope -ARG S6_OVERLAY_VERSION=3.1.2.0 +ARG S6_OVERLAY_VERSION=3.2.0.0 ENV S6_OVERLAY_VERSION=$S6_OVERLAY_VERSION # using an explicit default argument for TARGETPLATFORM will override the buildx implicit value