From 732252d12054af938053c5fef668c069d2e9fbc9 Mon Sep 17 00:00:00 2001 From: Matilda Montgomery Horger Date: Sun, 21 Jan 2024 13:24:26 -0800 Subject: [PATCH] Fix test.sh by using the supplied command in docker-entrypoint.sh --- Dockerfile | 1 + src/docker-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e437f26..59b19c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,5 +11,6 @@ COPY [ "/src/vsftpd.conf", "/etc" ] COPY [ "/src/docker-entrypoint.sh", "/" ] ENTRYPOINT [ "/docker-entrypoint.sh" ] +CMD [ "/usr/sbin/vsftpd" ] EXPOSE 20/tcp 21/tcp 40000-40009/tcp HEALTHCHECK CMD netstat -lnt | grep :21 || exit 1 diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh index 43ae0b3..0024f05 100755 --- a/src/docker-entrypoint.sh +++ b/src/docker-entrypoint.sh @@ -22,4 +22,4 @@ tail -f /var/log/vsftpd.log | tee /dev/stdout & touch /var/log/xferlog tail -f /var/log/xferlog | tee /dev/stdout & -/usr/sbin/vsftpd +exec "$@"