Skip to content

Commit

Permalink
update s6-overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasCARPi committed Sep 20, 2024
1 parent 508d887 commit 6a7ab21
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6a7ab21

Please sign in to comment.