diff --git a/.travis.yml b/.travis.yml index 61cf6f6..e7d1d81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,19 +19,19 @@ install: --tag ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} . - docker build --no-cache - --tag ${TRAVIS_REPO_SLUG}:noreusessl - -f Dockerfile_noreusessl . + --tag ${TRAVIS_REPO_SLUG}:nossl + -f Dockerfile_nossl . script: - DOCKERCONTAINER=$(docker run -d -p 127.0.0.1:${CLIENT_PORT}:21 -e ADDRESS=ftp.example.com ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT}) - sleep 5 - docker ps -f id=${DOCKERCONTAINER} - nc 127.0.0.1 ${CLIENT_PORT} < /dev/null - hadolint Dockerfile -- hadolint Dockerfile_noreusessl +- hadolint Dockerfile_nossl - docker stop ${DOCKERCONTAINER} && docker rm -fv ${DOCKERCONTAINER} after_success: - docker tag ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} aminvakil/alpine-ftp-server-tls - echo "$DOCKER_PASSWORD" | docker login -u aminvakil --password-stdin - docker push aminvakil/alpine-ftp-server-tls -- docker tag ${TRAVIS_REPO_SLUG}:noreusessl aminvakil/alpine-ftp-server-tls:noreusessl -- docker push aminvakil/alpine-ftp-server-tls:noreusessl +- docker tag ${TRAVIS_REPO_SLUG}:nossl aminvakil/alpine-ftp-server-tls:nossl +- docker push aminvakil/alpine-ftp-server-tls:nossl diff --git a/Dockerfile_noreusessl b/Dockerfile_nossl similarity index 68% rename from Dockerfile_noreusessl rename to Dockerfile_nossl index 489b2a6..a40a211 100644 --- a/Dockerfile_noreusessl +++ b/Dockerfile_nossl @@ -4,8 +4,7 @@ LABEL maintainer="Amin Vakil " RUN apk --no-cache add vsftpd=3.0.3-r6 -COPY vsftpd.pem /etc/ssl/certs/vsftpd.pem COPY start_vsftpd.sh /usr/local/bin/start_vsftpd.sh -COPY vsftpd.conf_noreusessl /etc/vsftpd/vsftpd.conf +COPY vsftpd.conf_nossl /etc/vsftpd/vsftpd.conf ENTRYPOINT ["/usr/local/bin/start_vsftpd.sh"] diff --git a/vsftpd.conf_noreusessl b/vsftpd.conf_nossl similarity index 71% rename from vsftpd.conf_noreusessl rename to vsftpd.conf_nossl index c6d2c38..de9220a 100644 --- a/vsftpd.conf_noreusessl +++ b/vsftpd.conf_nossl @@ -55,19 +55,3 @@ seccomp_sandbox=NO # # Run in background background=NO - -ssl_enable=YES - -# by default all non anonymous logins and forced to use SSL to send and receive password and data, set to NO to allow non secure connections -force_local_logins_ssl=YES -force_local_data_ssl=YES - -# provide the path of your certificate and of your private key -# note that both can be contained in the same file or in different files -rsa_cert_file=/etc/ssl/certs/vsftpd.pem -rsa_private_key_file=/etc/ssl/certs/vsftpd.pem - -# this setting is set to YES by default and requires all data connections exhibit session reuse which proves they know the secret of the control channel. -# this is more secure but is not supported by many FTP clients, set to NO for better compatibility -require_ssl_reuse=NO -ssl_ciphers=HIGH