From e4c599a3de234c2065b690c32c073785ba7c4416 Mon Sep 17 00:00:00 2001 From: Alain Seys Date: Thu, 25 Aug 2022 16:28:29 +0200 Subject: [PATCH 1/8] Update log directory from local logs/vsftpd to the remote file /var/log/vsftpd.log --- .gitignore | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 485dee6..3ebbbaa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea +logs/* diff --git a/docker-compose.yml b/docker-compose.yml index dd23e90..5b0de1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,4 +16,4 @@ services: - 21100-21110:21100-21110 volumes: - ./home:/home/vsftpd - - ./logs:/var/log/vsftpd + - ./logs/vsftpd.log:/var/log/vsftpd.log From 14d8a2adfea9e44af49afe0079c19cd2c6251b5e Mon Sep 17 00:00:00 2001 From: Nick Miller Date: Sat, 5 Nov 2022 00:58:34 +0000 Subject: [PATCH 2/8] Updated base image to centos8-stream --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3a5cad..4ba21a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:7 +FROM quay.io/centos/centos:stream8 ARG USER_ID=14 ARG GROUP_ID=50 From 59244b426803ed470cb9dd2191e859f12c308f31 Mon Sep 17 00:00:00 2001 From: Nick Miller Date: Sat, 5 Nov 2022 01:27:01 +0000 Subject: [PATCH 3/8] updated to Centos 8 Stream --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ba21a1..c9786f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,7 @@ LABEL Description="vsftpd Docker image based on Centos 7. Supports passive mode Version="1.0" RUN yum -y update && yum clean all -RUN yum install -y \ - vsftpd \ - db4-utils \ - db4 \ - iproute && yum clean all +RUN yum install -y vsftpd iproute && yum clean all RUN usermod -u ${USER_ID} ftp RUN groupmod -g ${GROUP_ID} ftp From ad519eaead73d98b777d5e9865289d33aa2503d4 Mon Sep 17 00:00:00 2001 From: Nick Miller Date: Sat, 5 Nov 2022 01:28:21 +0000 Subject: [PATCH 4/8] Updated to Centos 9 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9786f2..6031a04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM quay.io/centos/centos:stream8 +FROM quay.io/centos/centos:stream9 ARG USER_ID=14 ARG GROUP_ID=50 MAINTAINER Fer Uria -LABEL Description="vsftpd Docker image based on Centos 7. Supports passive mode and virtual users." \ +LABEL Description="vsftpd Docker image based on Centos 9. Supports passive mode and virtual users." \ License="Apache License 2.0" \ Usage="docker run -d -p [HOST PORT NUMBER]:21 -v [HOST FTP HOME]:/home/vsftpd fauria/vsftpd" \ Version="1.0" From d4f5697467d585d1de6613434907baa97035dff5 Mon Sep 17 00:00:00 2001 From: Nick Miller Date: Sat, 5 Nov 2022 01:44:02 +0000 Subject: [PATCH 5/8] Removed strange char from conf file --- vsftpd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsftpd.conf b/vsftpd.conf index 1f77ed2..a2ff55b 100644 --- a/vsftpd.conf +++ b/vsftpd.conf @@ -45,7 +45,7 @@ port_enable=YES connect_from_port_20=YES ftp_data_port=20 -## Disable seccomp filter sanboxing +## Disable seccomp filter sanboxing seccomp_sandbox=NO ### Variables set at container runtime From 168f33687989009cbec766d9ef53a8185dc656c8 Mon Sep 17 00:00:00 2001 From: Nick Miller Date: Sat, 5 Nov 2022 01:47:29 +0000 Subject: [PATCH 6/8] Added libdb-utils as replacement for db4-utils from Centos 7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6031a04..003fd0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ LABEL Description="vsftpd Docker image based on Centos 9. Supports passive mode Version="1.0" RUN yum -y update && yum clean all -RUN yum install -y vsftpd iproute && yum clean all +RUN yum install -y vsftpd libdb-utils iproute && yum clean all RUN usermod -u ${USER_ID} ftp RUN groupmod -g ${GROUP_ID} ftp From 936912f5ff86bb4f0375b6e6f0a7abb9554bac01 Mon Sep 17 00:00:00 2001 From: Nick Miller Date: Sat, 5 Nov 2022 02:04:07 +0000 Subject: [PATCH 7/8] Updated readme with new version numbers --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 38b1799..788be41 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ This Docker container implements a vsftpd server, with the following features: - * Centos 7 base image. - * vsftpd 3.0 + * Centos 9 base image. + * vsftpd 3.0.3 * Virtual users * Passive mode * Logging to a file or STDOUT. From d4b6a173e551d57fafb2601d017d1c9284781949 Mon Sep 17 00:00:00 2001 From: Nick Miller Date: Sat, 5 Nov 2022 02:33:56 +0000 Subject: [PATCH 8/8] Better default logging configuration --- vsftpd.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vsftpd.conf b/vsftpd.conf index a2ff55b..8b6376e 100644 --- a/vsftpd.conf +++ b/vsftpd.conf @@ -37,8 +37,12 @@ allow_writeable_chroot=YES hide_ids=YES ## Enable logging +dual_log_enable=YES +log_ftp_protocol=NO +vsftpd_log_file=/var/log/vsftpd/vsftpd.log xferlog_enable=YES -xferlog_file=/var/log/vsftpd/vsftpd.log +xferlog_std_format=YES +xferlog_file=/var/log/vsftpd/xferlog ## Enable active mode port_enable=YES