From 10aef8252ceb8fcb04a2b345ccfb92929583a96c Mon Sep 17 00:00:00 2001 From: tyranron Date: Mon, 10 Jun 2024 12:12:21 +0200 Subject: [PATCH] Upgrade s6-overlay to 3.2.0.0 version --- CHANGELOG.md | 12 ++++++++++++ Dockerfile | 7 ++++--- README.md | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4ec3fe..a933e4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,18 @@ All user visible changes to this project will be documented in this file. This p +## [1.0.51-r25] · 2024-06-10 +[1.0.51-r25]: /../../tree/1.0.51-r25 + +[Diff](/../../compare/1.0.51-r24...1.0.51-r25) + +### Upgraded + +- [s6-overlay] 3.2.0.0: + + + + ## [1.0.51-r24] · 2024-05-24 [1.0.51-r24]: /../../tree/1.0.51-r24 diff --git a/Dockerfile b/Dockerfile index b6e26dc..0459ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM alpine:3.20 ARG pure_ftpd_ver=1.0.51 -ARG s6_overlay_ver=3.1.6.2 -ARG build_rev=24 +ARG s6_overlay_ver=3.2.0.0 +ARG build_rev=25 # Build and install Pure-FTPd @@ -88,7 +88,8 @@ RUN apk add --update --no-cache --virtual .tool-deps \ ENV S6_KEEP_ENV=1 \ S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \ - S6_CMD_WAIT_FOR_SERVICES=1 + S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000 COPY rootfs / diff --git a/README.md b/README.md index 34ca215..8fd0e20 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Pure-FTPd Docker image ## Supported tags and respective `Dockerfile` links -- [`1.0.51-r24`, `1.0.51`, `1.0`, `1`, `latest`][201] +- [`1.0.51-r25`, `1.0.51`, `1.0`, `1`, `latest`][201]