From 5254047bb3977e95ba2c4b4728d8f370f072af97 Mon Sep 17 00:00:00 2001 From: tyranron Date: Mon, 31 Jan 2022 16:00:48 +0200 Subject: [PATCH] Upgrade s6-overlay to 3.0.0.2 version --- CHANGELOG.md | 12 +++++++++++ Dockerfile | 21 ++++++++++++------- README.md | 2 +- .../s6-rc.d/create-puredb/run.sh} | 0 .../etc/s6-overlay/s6-rc.d/create-puredb/type | 1 + .../etc/s6-overlay/s6-rc.d/create-puredb/up | 1 + rootfs/etc/s6-overlay/s6-rc.d/syslog/run | 5 +++++ rootfs/etc/s6-overlay/s6-rc.d/syslog/type | 1 + .../s6-rc.d/user/contents.d/create-puredb | 0 .../s6-overlay/s6-rc.d/user/contents.d/syslog | 0 rootfs/etc/services.d/syslog/run | 3 --- tests/main.bats | 9 ++++++++ 12 files changed, 43 insertions(+), 12 deletions(-) rename rootfs/etc/{cont-init.d/10-create-puredb.sh => s6-overlay/s6-rc.d/create-puredb/run.sh} (100%) create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/create-puredb/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/create-puredb/up create mode 100755 rootfs/etc/s6-overlay/s6-rc.d/syslog/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/syslog/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/create-puredb create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/syslog delete mode 100755 rootfs/etc/services.d/syslog/run diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c0d7be..65147fc 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.50-r1] · 2021-01-31 +[1.0.50-r1]: /../../tree/1.0.50-r1 + +[Diff](/../../compare/1.0.50-r0...1.0.50-r1) + +### Upgraded + +- [s6-overlay] 3.0.0.2: + + + + ## [1.0.50-r0] · 2021-01-25 [1.0.50-r0]: /../../tree/1.0.50-r0 diff --git a/Dockerfile b/Dockerfile index 7ee4ac2..f7afac4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM alpine:3.15 ARG pure_ftpd_ver=1.0.50 -ARG s6_overlay_ver=2.2.0.3 -ARG build_rev=0 +ARG s6_overlay_ver=3.0.0.2 +ARG build_rev=1 LABEL org.opencontainers.image.source="\ https://github.com/instrumentisto/pure-ftpd-docker-image" @@ -77,23 +77,28 @@ RUN apk update \ # Install s6-overlay RUN apk add --update --no-cache --virtual .tool-deps \ curl \ - && curl -fL -o /tmp/s6-overlay.tar.gz \ - https://github.com/just-containers/s6-overlay/releases/download/v${s6_overlay_ver}/s6-overlay-amd64.tar.gz \ - && tar -xzf /tmp/s6-overlay.tar.gz -C / \ + && curl -fL -o /tmp/s6-overlay-noarch.tar.xz \ + https://github.com/just-containers/s6-overlay/releases/download/v${s6_overlay_ver}/s6-overlay-noarch-${s6_overlay_ver}.tar.xz \ + && curl -fL -o /tmp/s6-overlay-bin.tar.xz \ + https://github.com/just-containers/s6-overlay/releases/download/v${s6_overlay_ver}/s6-overlay-x86_64-${s6_overlay_ver}.tar.xz \ + && tar -xf /tmp/s6-overlay-noarch.tar.xz -C / \ + && tar -xf /tmp/s6-overlay-bin.tar.xz -C / \ + && which syslogd \ \ # Cleanup unnecessary stuff && apk del .tool-deps \ && rm -rf /var/cache/apk/* \ /tmp/* -ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \ +ENV S6_KEEP_ENV=1 \ + S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \ S6_CMD_WAIT_FOR_SERVICES=1 COPY rootfs / -RUN chmod +x /etc/services.d/*/run \ - /etc/cont-init.d/* +RUN chmod +x /etc/s6-overlay/s6-rc.d/*/run \ + /etc/s6-overlay/s6-rc.d/*/*.sh EXPOSE 21 30000-30009 diff --git a/README.md b/README.md index bf03e46..1d15cec 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Pure-FTPd Docker image ## Supported tags and respective `Dockerfile` links -- [`1.0.50-r0`, `1.0.50`, `1.0`, `1`, `latest`][201] +- [`1.0.50-r1`, `1.0.50`, `1.0`, `1`, `latest`][201] diff --git a/rootfs/etc/cont-init.d/10-create-puredb.sh b/rootfs/etc/s6-overlay/s6-rc.d/create-puredb/run.sh similarity index 100% rename from rootfs/etc/cont-init.d/10-create-puredb.sh rename to rootfs/etc/s6-overlay/s6-rc.d/create-puredb/run.sh diff --git a/rootfs/etc/s6-overlay/s6-rc.d/create-puredb/type b/rootfs/etc/s6-overlay/s6-rc.d/create-puredb/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/create-puredb/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/create-puredb/up b/rootfs/etc/s6-overlay/s6-rc.d/create-puredb/up new file mode 100644 index 0000000..34b3aae --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/create-puredb/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/create-puredb/run.sh diff --git a/rootfs/etc/s6-overlay/s6-rc.d/syslog/run b/rootfs/etc/s6-overlay/s6-rc.d/syslog/run new file mode 100755 index 0000000..d830755 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/syslog/run @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +exec /sbin/syslogd -n diff --git a/rootfs/etc/s6-overlay/s6-rc.d/syslog/type b/rootfs/etc/s6-overlay/s6-rc.d/syslog/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/syslog/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/create-puredb b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/create-puredb new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/syslog b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/syslog new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/services.d/syslog/run b/rootfs/etc/services.d/syslog/run deleted file mode 100755 index d6490a4..0000000 --- a/rootfs/etc/services.d/syslog/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec syslogd -n diff --git a/tests/main.bats b/tests/main.bats index 2c0ae38..898f7c6 100644 --- a/tests/main.bats +++ b/tests/main.bats @@ -44,3 +44,12 @@ $IMAGE test -f /etc/pureftpd.pdb [ "$status" -eq 0 ] } + +@test "PURE_PASSWDFILE is converted to PURE_DBFILE from custom location" { + run docker run --rm \ + -e PURE_PASSWDFILE=/tmp/pureftpd.passwd \ + -e PURE_DBFILE=/pureftpd.pdb \ + -v $(pwd)/tests/resources/pureftpd.passwd:/tmp/pureftpd.passwd:ro \ + $IMAGE test -f /pureftpd.pdb + [ "$status" -eq 0 ] +}