From d5d670f6823426f4e685cfa6a1f0cae0b55d886e Mon Sep 17 00:00:00 2001 From: Adrian Dvergsdal Date: Wed, 17 Jan 2018 22:36:44 +0100 Subject: [PATCH 1/2] Use lower-case usernames in test. See #109 for more info. --- tests/run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/run b/tests/run index ddc2978..4e40de1 100755 --- a/tests/run +++ b/tests/run @@ -52,12 +52,12 @@ function beforeTest() { $sudo docker run \ -v "$tmpDir/users:/etc/sftp/users.conf:ro" \ -v "$scriptDir/id_rsa.pub":/home/test/.ssh/keys/id_rsa.pub:ro \ - -v "$scriptDir/id_rsa.pub":/home/userFromEnv/.ssh/keys/id_rsa.pub:ro \ + -v "$scriptDir/id_rsa.pub":/home/user-from-env/.ssh/keys/id_rsa.pub:ro \ -v "$scriptDir/id_rsa.pub":/home/user.with.dot/.ssh/keys/id_rsa.pub:ro \ -v "$tmpDir":/home/test/share \ --name "$sftpContainerName" \ --expose 22 \ - -e "SFTP_USERS=userFromEnv::$(id -u):$(id -g) userFromEnv2::$(id -u):$(id -g)" \ + -e "SFTP_USERS=user-from-env::$(id -u):$(id -g) user-from-env-2::$(id -u):$(id -g)" \ -d "$sftpImageName" \ > "$redirect" @@ -150,7 +150,7 @@ function testUserWithDotLogin() { function testLoginUsingUserFromEnv() { $skipAllTests && skip && return 0 - runSftpCommands "$sftpContainerName" "userFromEnv" "exit" + runSftpCommands "$sftpContainerName" "user-from-env" "exit" assertReturn $? 0 } From 87bd5bd59497da9b352b5bef67cd577b7824b001 Mon Sep 17 00:00:00 2001 From: Adrian Dvergsdal Date: Wed, 17 Jan 2018 22:53:46 +0100 Subject: [PATCH 2/2] Update README.md on Alpine 3.7 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f129907..67e882b 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ - [`debian-stretch`, `debian`, `latest` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/master/Dockerfile) [![](https://images.microbadger.com/badges/image/atmoz/sftp.svg)](http://microbadger.com/images/atmoz/sftp "Get your own image badge on microbadger.com") - [`debian-jessie` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/debian-jessie/Dockerfile) [![](https://images.microbadger.com/badges/image/atmoz/sftp:debian-jessie.svg)](http://microbadger.com/images/atmoz/sftp:debian-jessie "Get your own image badge on microbadger.com") -- [`alpine-3.6`, `alpine` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/alpine/Dockerfile) [![](https://images.microbadger.com/badges/image/atmoz/sftp:alpine.svg)](http://microbadger.com/images/atmoz/sftp:alpine "Get your own image badge on microbadger.com") -- [`alpine-3.5` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/alpine-3.5/Dockerfile) [![](https://images.microbadger.com/badges/image/atmoz/sftp:alpine-3.5.svg)](http://microbadger.com/images/atmoz/sftp:alpine "Get your own image badge on microbadger.com") +- [`alpine-3.7`, `alpine` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/alpine/Dockerfile) [![](https://images.microbadger.com/badges/image/atmoz/sftp:alpine-3.7.svg)](http://microbadger.com/images/atmoz/sftp:alpine-3.7 "Get your own image badge on microbadger.com") +- [`alpine-3.6` (*Dockerfile*)](https://github.com/atmoz/sftp/blob/alpine-3.6/Dockerfile) [![](https://images.microbadger.com/badges/image/atmoz/sftp:alpine-3.6.svg)](http://microbadger.com/images/atmoz/sftp:alpine-3.6 "Get your own image badge on microbadger.com") # Securely share your files