update to buster

.gitignore

@@ -1,7 +1,4 @@
 *.swp
 srv/
-config/
+env
-logs/
-data/
-.env
 vsftpd.pem

Dockerfile

@@ -1,10 +1,8 @@
-FROM debian:stable
+FROM debian:buster
-
-LABEL maintainer="Luca Derderian <luca@wululu.de>"
-LABEL version="${VERSION:-2.0}"
 
 ARG FTP_UID=48
 ARG FTP_GID=48
+
 RUN set -x \
   && groupadd -g ${FTP_GID} ftp \
   && useradd --no-create-home --home-dir /srv -s /bin/false --uid ${FTP_UID} --gid ${FTP_GID} -c 'ftp daemon' ftp \
@@ -12,25 +10,24 @@ RUN set -x \
 
 RUN set -x \
   && apt-get update \
-  && apt-get -y full-upgrade \
+  && apt-get install -y --no-install-recommends vsftpd db5.3-util whois \
-  && apt-get install -y --no-install-recommends vsftpd db-util whois gettext-base \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
   ;
 
 RUN set -x \
-  && mkdir -p /var/run/vsftpd/empty /etc/vsftpd/user_conf /var/ftp /srv /templates \
+  && mkdir -p /var/run/vsftpd/empty /etc/vsftpd/user_conf /var/ftp /srv \
   && touch /var/log/vsftpd.log \
   && rm -rf /srv/ftp \
   ;
 
-COPY vsftpd*.conf /templates/
+COPY vsftpd*.conf /etc/
 COPY vsftpd_virtual /etc/pam.d/
 COPY *.sh /
 
 VOLUME ["/etc/vsftpd", "/srv"]
 
-EXPOSE 21
+EXPOSE 21 4559 4560 4561 4562 4563 4564
 
 ENTRYPOINT ["/entry.sh"]
 CMD ["vsftpd"]

Makefile

@@ -16,21 +16,21 @@ bash:
 	docker run --rm -it $(IMAGE_NAME):$(TAG) bash
 
 env:
-	@echo "FTP_USER=ftp" >> .env
+	@echo "FTP_USER=ftp" >> env
-	@echo "FTP_PASSWORD=ftp" >> .env
+	@echo "FTP_PASSWORD=ftp" >> env
 
 vsftpd.pem:
 	openssl req -new -newkey rsa:2048 -days 365 -nodes -sha256 -x509 -keyout vsftpd.pem -out vsftpd.pem -subj '/CN=self_signed'
 
 run: env
-	$(eval ID := $(shell docker run -d --env-file .env -v $(shell pwd)/srv:/srv ${IMAGE_NAME}:${TAG}))
+	$(eval ID := $(shell docker run -d --env-file env -v $(shell pwd)/srv:/srv ${IMAGE_NAME}:${TAG}))
 	$(eval IP := $(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${ID}))
 	@echo "Running ${ID} @ ftp://${IP}"
 	@docker attach ${ID}
 	@docker kill ${ID}
 
 run-ssl: env vsftpd.pem
-	$(eval ID := $(shell docker run -d --env-file .env -v $(shell pwd)/srv:/srv -v $(PWD)/vsftpd.pem:/etc/ssl/certs/vsftpd.crt -v $(PWD)/vsftpd.pem:/etc/ssl/private/vsftpd.key ${IMAGE_NAME}:${TAG} vsftpd /etc/vsftpd_ssl.conf))
+	$(eval ID := $(shell docker run -d --env-file env -v $(shell pwd)/srv:/srv -v $(PWD)/vsftpd.pem:/etc/ssl/certs/vsftpd.crt -v $(PWD)/vsftpd.pem:/etc/ssl/private/vsftpd.key ${IMAGE_NAME}:${TAG} vsftpd /etc/vsftpd_ssl.conf))
 	$(eval IP := $(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${ID}))
 	@echo "Running ${ID} @ ftp://${IP}"
 	@docker attach ${ID}

README.md

@@ -2,11 +2,6 @@
 
 This is a micro-service image for VSFTPD.
 
-It is a fork from [panubo's docker-vsftpd](https://github.com/panubo/docker-vsftpd) (thanks!) and slightly modified to suit my needs:
-* Update base image to `debian:latest`
-* Support for configurable min and max port in passive mode
-  by templating the config files (via envsubst)
-
 There are a few limitations but it will work if you are using host networking
 `--net host` or have a direct/routed network between the Docker container and
 the client.
@@ -38,24 +33,8 @@ which is in the _whois_ debian package.
 - `FTP_PASV_ADDRESS`: override the IP address that vsftpd will advertise in
   response to the PASV command
 
-- `FTP_PASV_MIN_PORT`: Minimum port for passive mode (remember to bind the ports if not used with compose file)
-
-- `FTP_PASV_MAX_PORT`: Maximum port for passive mode (remember to bind the ports if not used with compose file)
-
 ## Usage Example
 
-### Docker Compose
-First, setup your .env file by copying the sample file and modifying it to suit your needs.
-```
-cp env.sample .env
-vi .env
-```
-Then run the stack
-```
-docker compose up -d
-```
-
-### Docker
 ```
 docker run --rm -it -p 21:21 -p 4559-4564:4559-4564 -e FTP_USER=ftp -e FTP_PASSWORD=ftp docker.io/panubo/vsftpd:latest
 ```
@@ -85,4 +64,4 @@ See [serverfault: vsftp: whu is allow_writable_chroot=YES a bad idea?](https://s
 
 ## Logs
 
-To get the FTP logs mount `/var/log` outside of the container. For example add `-v /var/log/ftp:/var/log` to your `docker run ...` command or use `docker compose`.
+To get the FTP logs mount `/var/log` outside of the container. For example add `-v /var/log/ftp:/var/log` to your `docker run ...` command.

add-virtual-user.sh

@@ -21,4 +21,4 @@ if [[ "${1}" == "-d" ]]; then
   shift
 fi
 
-printf '%s\n%s\n' "${1}" "${2}" | db_load -T -t hash "${DB}"
+printf '%s\n%s\n' "${1}" "${2}" | db5.3_load -T -t hash "${DB}"

compose.yml

@@ -1,16 +0,0 @@
-services:
-  vsftpd:
-    container_name: vsftpd
-    image: wululu/vsftpd:${VERSION:-2.0}
-    build:
-      context: .
-      args:
-        VERSION: ${VERSION:-2.0}
-    volumes:
-      - ./data:/srv
-      - ./config:/etc/vsftpd
-      - ./logs:/var/log
-    ports:
-      - "${FTP_PORT:-21}:21"
-      - "${FTP_PASV_MIN_PORT:-4559}-${FTP_PASV_MAX_PORT:-4564}:${FTP_PASV_MIN_PORT:-4559}-${FTP_PASV_MAX_PORT:-4564}"
-    env_file: .env

entry.sh

@@ -5,21 +5,12 @@ set -e
 
 [[ "${DEBUG}" == "true" ]] && set -x
 
-# Replace variables in config files
-for file in /templates/*; do
-  if [[ -f "$file" ]]; then
-    filename=$(basename "$file")
-    envsubst < "$file" > "/etc/$filename"
-    echo "Created /etc/${filename}"
-  fi
-done
-
 # Generate password if hash not set
-if [[ -n "${FTP_PASSWORD}" ]] && [[ -z "${FTP_PASSWORD_HASH}" ]]; then
+if [[ ! -z "${FTP_PASSWORD}" ]] && [[ -z "${FTP_PASSWORD_HASH}" ]]; then
   FTP_PASSWORD_HASH="$(echo "${FTP_PASSWORD}" | mkpasswd -s -m sha-512)"
 fi
 
-if [[ -n "${FTP_USER}" ]] || [[ -n "${FTP_PASSWORD_HASH}" ]]; then
+if [[ ! -z "${FTP_USER}" ]] || [[ ! -z "${FTP_PASSWORD_HASH}" ]]; then
   /add-virtual-user.sh -d "${FTP_USER}" "${FTP_PASSWORD_HASH}"
 fi
 
@@ -31,13 +22,20 @@ while read -r user; do
 done < <(env | grep "FTP_USER_" | sed 's/^\(FTP_USER_[a-zA-Z0-9]*\)=.*/\1/')
 
 # Support user directories
-if [[ -n "${FTP_USERS_ROOT}" ]]; then
+if [[ ! -z "${FTP_USERS_ROOT}" ]]; then
   # shellcheck disable=SC2016
   sed -i 's/local_root=.*/local_root=\/srv\/$USER/' /etc/vsftpd*.conf
 fi
 
+# Support setting the passive address
+if [[ ! -z "$FTP_PASV_ADDRESS" ]]; then
+  for f in /etc/vsftpd*.conf; do
+    echo "pasv_address=${FTP_PASV_ADDRESS}" >> "$f"
+  done
+fi
+
 # Manage /srv permissions
-if [[ -n "${FTP_CHOWN_ROOT}" ]]; then
+if [[ ! -z "${FTP_CHOWN_ROOT}" ]]; then
   chown ftp:ftp /srv
 fi
 

env.sample

@@ -1,11 +0,0 @@
-COMPOSE_PROJECT_NAME=vsftpd
-
-VERSION=2.0
-
-FTP_USER=
-FTP_PASSWORD=
-FTP_PORT=
-
-FTP_PASV_ADDRESS=
-FTP_PASV_MIN_PORT=
-FTP_PASV_MAX_PORT=

vsftpd.conf

@@ -34,6 +34,5 @@ hide_ids=YES
 connect_from_port_20=YES
 listen=YES
 tcp_wrappers=YES
-pasv_address=${FTP_PASV_ADDRESS}
+pasv_min_port=4559
-pasv_min_port=${FTP_PASV_MIN_PORT}
+pasv_max_port=4564
-pasv_max_port=${FTP_PASV_MAX_PORT}

vsftpd_ssl.conf

@@ -34,9 +34,8 @@ hide_ids=YES
 connect_from_port_20=YES
 listen=YES
 tcp_wrappers=YES
-pasv_address=${FTP_PASV_ADDRESS}
+pasv_min_port=4559
-pasv_min_port=${FTP_PASV_MIN_PORT}
+pasv_max_port=4564
-pasv_max_port=${FTP_PASV_MAX_PORT}
 
 # SSL
 ssl_enable=Yes