Merge pull request #1005 from FanDjango/INTEGRATION_1

Fix/update vsftpd docker, attempt TLS for all

FluentFTP.Dockers/vsftpd/Dockerfile

@@ -1,51 +1,41 @@
-FROM centos:7
+FROM debian:bullseye
 
-ARG USER_ID=14
-ARG GROUP_ID=50
+MAINTAINER FluentFTP
+LABEL Description="FluentFTP vsftpd docker image based on Debian Bullseye."
 
-MAINTAINER Fer Uria <fauria@gmail.com>
-LABEL Description="vsftpd Docker image based on Centos 7. 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"
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
-RUN yum -y update && yum clean all
-RUN yum install -y \
+RUN apt -y update && apt clean all
+
+RUN apt install -y \
+	apt-utils \
+	dialog
+
+RUN apt install -y \
 	vsftpd \
-	db4-utils \
-	db4 \
-	iproute && yum clean all
-
-RUN usermod -u ${USER_ID} ftp
-RUN groupmod -g ${GROUP_ID} ftp
-
-ENV FTP_USER **String**
-ENV FTP_PASS **Random**
-ENV PASV_ADDRESS **IPv4**
-ENV PASV_ADDR_RESOLVE NO
-ENV PASV_ENABLE YES
-ENV PASV_MIN_PORT 21100
-ENV PASV_MAX_PORT 21110
-ENV XFERLOG_STD_FORMAT NO
-ENV LOG_STDOUT **Boolean**
-ENV FILE_OPEN_MODE 0666
-ENV LOCAL_UMASK 077
-ENV REVERSE_LOOKUP_ENABLE YES
-ENV PASV_PROMISCUOUS NO
-ENV PORT_PROMISCUOUS NO
-
-COPY vsftpd.conf /etc/vsftpd/
-RUN sed -i -e "s/\r//" /etc/vsftpd/vsftpd.conf
-COPY vsftpd_virtual /etc/pam.d/
-RUN sed -i -e "s/\r//" /etc/pam.d/vsftpd_virtual
+	iproute2
+
+RUN apt remove --purge -y \
+	exim4-base \
+	mariadb-common
+
+RUN apt autoremove -y
+
+COPY vsftpd.conf /etc/
+RUN sed -i -e "s/\r//" /etc/vsftpd.conf
 COPY run-vsftpd.sh /usr/sbin/
 RUN sed -i -e "s/\r//" /usr/sbin/run-vsftpd.sh
 
 RUN chmod +x /usr/sbin/run-vsftpd.sh
-RUN mkdir -p /home/vsftpd/
-RUN chown -R ftp:ftp /home/vsftpd/
 
-VOLUME /home/vsftpd
+RUN useradd -m -p savatlcb.1m26 fluentuser
+
+RUN mkdir -p /home/fluentuser/
+RUN chown -R fluentuser:users /home/fluentuser/
+
+RUN mkdir /var/ftp
+
+VOLUME /home/fluentuser
 VOLUME /var/log/vsftpd
 
 EXPOSE 20 21