Merge lp:~dernils/duplicity/Dockerfile into lp:~duplicity-team/duplicity/0.8-series

[nils]

Minor changes to the setup.sh file. Now having subnet name and IP of the subnet for testing as a variable.

[lp:~dernils/duplicity/Dockerfile]

1227. By nils on 2017-05-15

minor changes to setup.sh

=== modified file 'testing/infrastructure/setup.sh'
--- testing/infrastructure/setup.sh	2017-05-14 07:17:59 +0000
+++ testing/infrastructure/setup.sh	2017-05-15 18:50:39 +0000
@@ -22,24 +22,31 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
+# Define the subnet and the name of the testnetwork that should be used for testing 
+subnet=10.10.10.0/24
+testnetwork=testnetwork
+ip_ssh_server=10.10.10.4
+ip_ftp_server=10.10.10.3
+ip_duplicity_test=10.10.10.2
 
 # Check whether a specific docker network for testing is already exisitng. If not, create it.
-docker network inspect testnetwork &> /dev/null
+docker network inspect $testnetwork &> /dev/null
 
 if [ $? -ne 0 ]; then
     echo "docker testnetwork not found. Creating network."
-    docker network create --subnet=10.10.10.0/24 testnetwork
+    docker network create --subnet=$subnet $testnetwork
 fi
 
-
 # Remove all running instances of the test system and also remove the containers. This ensure
 # that the test infrastructure is frehshly started.
-docker rm -f $(docker stop $(docker ps -a -q --filter name=d70c0e18-37d5-11e7-a919-92ebcb67fe33-ftpd_server --format="{{.ID}}"))
-docker rm -f $(docker stop $(docker ps -a -q --filter name=ee681ee4-37d5-11e7-a919-92ebcb67fe33-duplicity_ssh_server --format="{{.ID}}"))
-docker rm -f $(docker stop $(docker ps -a -q --filter name=f3c09128-37d5-11e7-a919-92ebcb67fe33-duplicity_test --format="{{.ID}}"))
+# We are using UUIDs as part of the names of the docker container to ensure that we do not accidentially touch other containers
+docker rm -f $(docker stop $(docker ps  -a -q --filter name=d70c0e18-37d5-11e7-a919-92ebcb67fe33-ftpd_server --format="{{.ID}}"))
+docker rm -f $(docker stop $(docker ps  -a -q --filter name=ee681ee4-37d5-11e7-a919-92ebcb67fe33-duplicity_ssh_server --format="{{.ID}}"))
+docker rm -f $(docker stop $(docker ps  -a -q --filter name=f3c09128-37d5-11e7-a919-92ebcb67fe33-duplicity_test --format="{{.ID}}"))
 
 
 # Start the containers. Docker run will automatically download the image if necessary
-docker run -d --net testnetwork --ip 10.10.10.3 --name d70c0e18-37d5-11e7-a919-92ebcb67fe33-ftpd_server -p 21:21 -p 30000-30009:30000-30009 -e "PUBLICHOST=localhost" dernils/duplicity_testinfrastructure_ftp
-docker run -d --net testnetwork --ip 10.10.10.4 --name ee681ee4-37d5-11e7-a919-92ebcb67fe33-duplicity_ssh_server  -p 22:22 -e "PUBLICHOST=localhost" dernils/duplicity_testinfrastructure_ssh:latest 
-docker run --name f3c09128-37d5-11e7-a919-92ebcb67fe33-duplicity_test --net testnetwork --ip 10.10.10.2 -it  dernils/duplicitytest:latest
+# Hand over the parameters for testing to the main docker container 
+docker run -d --net $testnetwork --ip $ip_ftp_server --name d70c0e18-37d5-11e7-a919-92ebcb67fe33-ftpd_server -p 21:21 -p 30000-30009:30000-30009  dernils/duplicity_testinfrastructure_ftp
+docker run -d --net $testnetwork --ip $ip_ssh_server --name ee681ee4-37d5-11e7-a919-92ebcb67fe33-duplicity_ssh_server  -p 22:22 dernils/duplicity_testinfrastructure_ssh:latest 
+docker run --name f3c09128-37d5-11e7-a919-92ebcb67fe33-duplicity_test --net $testnetwork --ip $ip_duplicity_test -e DUPLICITY_TESTNETWORK=$testnetwork -e DUPLICITY_SUBNET=$subnet -e "PUBLICHOST=localhost" -e DUPLICITY_IP_SSH_SERVER=$ip_ssh_server -e DUPLICITY_IP_FTP_SERVER=$ip_ftp_server -it  dernils/duplicitytest:latest