From a2659f3deb04f8516a02e8ef611c4773c400dec3 Mon Sep 17 00:00:00 2001 From: Matthew Hayward Date: Wed, 28 Aug 2024 15:56:33 +0100 Subject: [PATCH 1/3] set sysconfdir and localstatedir, add with-peruserlimits --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7bfbf5f..9c79e91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,12 +37,15 @@ RUN apk update \ \ # Build Pure-FTPd from sources && ./configure --prefix=/usr \ + --sysconfdir=/etc/pure-ftpd \ + --localstatedir=/var/pure-ftpd \ --with-puredb \ --with-quotas \ --with-ratios \ --with-rfc2640 \ --with-throttling \ --with-tls \ + --with-peruserlimits \ --without-capabilities \ --without-humor \ --without-inetd \ @@ -61,7 +64,7 @@ RUN apk update \ && install -d -o pure-ftpd -g pure-ftpd /data \ # Disable daemonization && sed -i -e 's,^Daemonize .*,Daemonize no,' \ - /etc/pure-ftpd.conf \ + /etc/pure-ftpd/pure-ftpd.conf \ # No documentation included to keep image size smaller && rm -rf /usr/share/man/* \ \ @@ -102,4 +105,4 @@ EXPOSE 21 30000-30009 ENTRYPOINT ["/init"] -CMD ["pure-ftpd", "/etc/pure-ftpd.conf"] +CMD ["pure-ftpd", "/etc/pure-ftpd/pure-ftpd.conf"] From 204bee879def49fe60774673d4973e922c664abf Mon Sep 17 00:00:00 2001 From: Matthew Hayward Date: Wed, 28 Aug 2024 22:53:31 +0100 Subject: [PATCH 2/3] address pr comments --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c79e91..3c2488f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,8 +37,6 @@ RUN apk update \ \ # Build Pure-FTPd from sources && ./configure --prefix=/usr \ - --sysconfdir=/etc/pure-ftpd \ - --localstatedir=/var/pure-ftpd \ --with-puredb \ --with-quotas \ --with-ratios \ @@ -64,7 +62,7 @@ RUN apk update \ && install -d -o pure-ftpd -g pure-ftpd /data \ # Disable daemonization && sed -i -e 's,^Daemonize .*,Daemonize no,' \ - /etc/pure-ftpd/pure-ftpd.conf \ + /etc/pure-ftpd.conf \ # No documentation included to keep image size smaller && rm -rf /usr/share/man/* \ \ @@ -105,4 +103,4 @@ EXPOSE 21 30000-30009 ENTRYPOINT ["/init"] -CMD ["pure-ftpd", "/etc/pure-ftpd/pure-ftpd.conf"] +CMD ["pure-ftpd", "/etc/pure-ftpd.conf"] From fd461dcfe19b52f1ade601c250344a2e787953f7 Mon Sep 17 00:00:00 2001 From: tyranron Date: Thu, 29 Aug 2024 17:32:10 +0300 Subject: [PATCH 3/3] Mention in CHAGELOG and version bump --- CHANGELOG.md | 14 ++++++++++++++ Dockerfile | 4 ++-- README.md | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6571a96..e139ba2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,20 @@ All user visible changes to this project will be documented in this file. This p +## [1.0.51-r28] · 2024-08-29 +[1.0.51-r28]: /../../tree/1.0.51-r28 + +[Diff](/../../compare/1.0.51-r27...1.0.51-r28) + +### Added + +- `PER_USER_LIMITS` support. ([#7]) + +[#7]: /../../pull/7 + + + + ## [1.0.51-r27] · 2024-07-26 [1.0.51-r27]: /../../tree/1.0.51-r27 diff --git a/Dockerfile b/Dockerfile index 3c2488f..93f0865 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.20 ARG pure_ftpd_ver=1.0.51 ARG s6_overlay_ver=3.2.0.0 -ARG build_rev=27 +ARG build_rev=28 # Build and install Pure-FTPd @@ -37,13 +37,13 @@ RUN apk update \ \ # Build Pure-FTPd from sources && ./configure --prefix=/usr \ + --with-peruserlimits \ --with-puredb \ --with-quotas \ --with-ratios \ --with-rfc2640 \ --with-throttling \ --with-tls \ - --with-peruserlimits \ --without-capabilities \ --without-humor \ --without-inetd \ diff --git a/README.md b/README.md index 9742b4b..bf59367 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Pure-FTPd Docker image ## Supported tags and respective `Dockerfile` links -- [`1.0.51-r27`, `1.0.51`, `1.0`, `1`, `latest`][201] +- [`1.0.51-r28`, `1.0.51`, `1.0`, `1`, `latest`][201] @@ -44,7 +44,7 @@ docker run -d -p 21:21 -p 30000-30009:30000-30009 instrumentisto/pure-ftpd ### Why so many ports opened? - + This is for `PASV` support, please see: [#5 PASV not fun :)][12]