From d1e01adef37d9d3f5dfa6d650df9b4440206fe83 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 30 Jul 2022 12:03:28 +0300
Subject: [PATCH] Remove FTP.

I'm not using it anymore. Replaced with WebDAV access.
---
 README.md          |  2 +-
 docker-compose.yml | 10 ----------
 vsftpd/Dockerfile  | 20 --------------------
 vsftpd/entrypoint  |  6 ------
 vsftpd/healthcheck |  9 ---------
 vsftpd/vsftpd.conf | 11 -----------
 6 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 vsftpd/Dockerfile
 delete mode 100755 vsftpd/entrypoint
 delete mode 100755 vsftpd/healthcheck
 delete mode 100644 vsftpd/vsftpd.conf

diff --git a/README.md b/README.md
index 03b84d3..ce3295d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![pipeline status](https://git.shore.co.il/nimrod/transmission-docker/badges/master/pipeline.svg)](https://git.shore.co.il/nimrod/transmission-docker/-/commits/master)
 
-> A dockerized Transmission daemon, RSS watcher and annonymous FTP server.
+> A dockerized Transmission daemon, RSS watcher and WebDAV access.
 
 ## Requirements
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 58a6063..6673a7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,16 +23,6 @@ services:
       - rss:/var/lib/transmission-rss/
     restart: always
 
-  ftp:
-    build:
-      context: vsftpd/
-    volumes:
-      - /srv/library:/var/lib/transmission/Downloads
-    ports:
-      - '21:21'
-      - 4559-4564:4559-4564
-    restart: always
-
   webdav:
     image: registry.shore.co.il/webdav
     volumes:
diff --git a/vsftpd/Dockerfile b/vsftpd/Dockerfile
deleted file mode 100644
index d3f6074..0000000
--- a/vsftpd/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM debian:buster-slim
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        ftp \
-        gosu \
-        netcat-openbsd \
-        vsftpd \
-    && \
-    mkdir -p /var/run/vsftpd/empty && \
-    install -d -m 755 /var/lib/transmission/Downloads && \
-    rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-COPY --chown=root:root entrypoint /usr/local/sbin/
-COPY --chown=root:root healthcheck /usr/local/bin
-COPY --chown=root:root vsftpd.conf /etc/vsftpd.conf
-VOLUME /var/lib/transmission/Downloads
-EXPOSE 21 4559 4560 4561 4562 4563 4564
-ENTRYPOINT [ "/usr/local/sbin/entrypoint" ]
-CMD [ "vsftpd" ]
-HEALTHCHECK CMD healthcheck || exit 1
diff --git a/vsftpd/entrypoint b/vsftpd/entrypoint
deleted file mode 100755
index ae54bd9..0000000
--- a/vsftpd/entrypoint
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eux
-
-touch /var/log/vsftpd.log
-tail -f /var/log/vsftpd.log &
-eval exec "$@"
diff --git a/vsftpd/healthcheck b/vsftpd/healthcheck
deleted file mode 100755
index 99e47ce..0000000
--- a/vsftpd/healthcheck
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -eux
-
-ftp -inv<<EOF
-open localhost
-user anonymous healthcheck
-ls
-bye
-EOF
diff --git a/vsftpd/vsftpd.conf b/vsftpd/vsftpd.conf
deleted file mode 100644
index 863b5f5..0000000
--- a/vsftpd/vsftpd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-listen=YES
-local_enable=NO
-anonymous_enable=YES
-write_enable=NO
-anon_root=/var/lib/transmission/Downloads
-listen_address=0.0.0.0
-xferlog_enable=YES
-pasv_min_port=4559
-pasv_max_port=4564
-connect_from_port_20=YES
-secure_chroot_dir=/var/run/vsftpd/empty
-- 
GitLab