diff --git a/sshpiperd/e2e/docker-compose.yml b/sshpiperd/e2e/docker-compose.yml index b5157cca..834c6ddb 100644 --- a/sshpiperd/e2e/docker-compose.yml +++ b/sshpiperd/e2e/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: client: - image: rastasheep/ubuntu-sshd + image: rsalian/centos-sshpass volumes: - workingdir:/workingdir - localkey:/local @@ -16,7 +16,7 @@ services: - "/test.sh" piper: environment: - - "SSHPIPERD_NO_CHECK_PERM=true" + - "SSHPIPERD_WORKINGDIR_NOCHECKPERM=true" build: ../.. links: - "host1:host1" diff --git a/sshpiperd/e2e/test.sh b/sshpiperd/e2e/test.sh index 7f84aec8..b2ae5abb 100644 --- a/sshpiperd/e2e/test.sh +++ b/sshpiperd/e2e/test.sh @@ -1,7 +1,7 @@ #!/bin/bash -apt-get update -apt-get install -y sshpass +#apt-get update +#apt-get install -y sshpass mkdir -p /local mkdir -p /workingdir/host{1,2} @@ -28,7 +28,7 @@ while true; do echo $rnd > /names/host1 t=`ssh host1@piper -p 2222 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /local/id_rsa cat /names/host1` - if [ $t != $rnd ];then + if [ "$t" != "$rnd" ];then echo -e $casename $fail else echo -e $casename $succ @@ -39,7 +39,7 @@ while true; do echo $rnd > /names/host2 t=`sshpass -p root ssh host2@piper -p 2222 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null cat /names/host2` - if [ $t != $rnd ];then + if [ "$t" != "$rnd" ];then echo -e $casename $fail else echo -e $casename $succ