diff --git a/README.md b/README.md index 03b84d3378326de1e9fdcc80d14749ad7e05b4d6..ce3295de9196773ce845e3a0330f457b32c7300b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [](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 58a6063abd4337ab44a862c9928b0c885294c4b8..6673a7f0f76e01190a321adbb94c3feff29ed735 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 d3f60741666e97cfb36b423d70b66d8dd815e9ba..0000000000000000000000000000000000000000 --- 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 ae54bd98f49ba5b66448fff7aa0cd2eeb9415ccd..0000000000000000000000000000000000000000 --- 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 99e47ce3bcbc0bf3bb140e669e671daa1fcc0598..0000000000000000000000000000000000000000 --- 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 863b5f5ff3f23d6fed8814891fd5404c72e5c94e..0000000000000000000000000000000000000000 --- 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