Add nossl tag
This commit is contained in:
parent
2c6cca21b5
commit
18d668a63e
3 changed files with 6 additions and 23 deletions
10
.travis.yml
10
.travis.yml
|
@ -19,19 +19,19 @@ install:
|
||||||
--tag ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} .
|
--tag ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} .
|
||||||
- docker build
|
- docker build
|
||||||
--no-cache
|
--no-cache
|
||||||
--tag ${TRAVIS_REPO_SLUG}:noreusessl
|
--tag ${TRAVIS_REPO_SLUG}:nossl
|
||||||
-f Dockerfile_noreusessl .
|
-f Dockerfile_nossl .
|
||||||
script:
|
script:
|
||||||
- DOCKERCONTAINER=$(docker run -d -p 127.0.0.1:${CLIENT_PORT}:21 -e ADDRESS=ftp.example.com ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT})
|
- DOCKERCONTAINER=$(docker run -d -p 127.0.0.1:${CLIENT_PORT}:21 -e ADDRESS=ftp.example.com ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT})
|
||||||
- sleep 5
|
- sleep 5
|
||||||
- docker ps -f id=${DOCKERCONTAINER}
|
- docker ps -f id=${DOCKERCONTAINER}
|
||||||
- nc 127.0.0.1 ${CLIENT_PORT} < /dev/null
|
- nc 127.0.0.1 ${CLIENT_PORT} < /dev/null
|
||||||
- hadolint Dockerfile
|
- hadolint Dockerfile
|
||||||
- hadolint Dockerfile_noreusessl
|
- hadolint Dockerfile_nossl
|
||||||
- docker stop ${DOCKERCONTAINER} && docker rm -fv ${DOCKERCONTAINER}
|
- docker stop ${DOCKERCONTAINER} && docker rm -fv ${DOCKERCONTAINER}
|
||||||
after_success:
|
after_success:
|
||||||
- docker tag ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} aminvakil/alpine-ftp-server-tls
|
- docker tag ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} aminvakil/alpine-ftp-server-tls
|
||||||
- echo "$DOCKER_PASSWORD" | docker login -u aminvakil --password-stdin
|
- echo "$DOCKER_PASSWORD" | docker login -u aminvakil --password-stdin
|
||||||
- docker push aminvakil/alpine-ftp-server-tls
|
- docker push aminvakil/alpine-ftp-server-tls
|
||||||
- docker tag ${TRAVIS_REPO_SLUG}:noreusessl 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:noreusessl
|
- docker push aminvakil/alpine-ftp-server-tls:nossl
|
||||||
|
|
|
@ -4,8 +4,7 @@ LABEL maintainer="Amin Vakil <info@aminvakil.com>"
|
||||||
|
|
||||||
RUN apk --no-cache add vsftpd=3.0.3-r6
|
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 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"]
|
ENTRYPOINT ["/usr/local/bin/start_vsftpd.sh"]
|
|
@ -55,19 +55,3 @@ seccomp_sandbox=NO
|
||||||
#
|
#
|
||||||
# Run in background
|
# Run in background
|
||||||
background=NO
|
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
|
|
Loading…
Reference in a new issue