Merge pull request #656 from xenon-middleware/xenonmiddleware-docker

Replace Docker images from `nlesc/xenon-*` to `xenonmiddlware/*`

README.md

@@ -126,7 +126,7 @@ public class CopyFileLocalToSftpAbsolutePaths {
         // requires credentials, so we need to create those too.
         //
         // Assume the remote system is actually just a Docker container (e.g.
-        // https://hub.docker.com/r/nlesc/xenon-ssh/), accessible via
+        // https://hub.docker.com/r/xenonmiddleware/ssh/), accessible via
         // port 10022 on localhost
         String location = "localhost:10022";
         String username = "xenon";
@@ -173,7 +173,7 @@ public class SlurmSubmitWordCountJob {
     public static void main(String[] args) throws Exception {
 
         // Assume the remote system is actually just a Docker container (e.g.
-        // https://hub.docker.com/r/nlesc/xenon-slurm/), accessible to user 'xenon' via
+        // https://hub.docker.com/r/xenonmiddleware/slurm/), accessible to user 'xenon' via
         // port 10022 on localhost, using password 'javagat'
         String location = "localhost:10022";
         String username = "xenon";
@@ -204,7 +204,7 @@ public class SlurmSubmitWordCountJob {
 }
 ```
 
-The output of the job will be written to ``/tmp/wc.stdout.txt`` file in the ``nlesc/xenon-slurm`` Docker container.
+The output of the job will be written to ``/tmp/wc.stdout.txt`` file in the ``xenonmiddleware/slurm`` Docker container.
 
 For more examples, see the tutorial at [Read The Docs](http://xenonrse2017.readthedocs.io/).
 

TESTING.md

@@ -51,15 +51,15 @@ Requirements:
 
 Run tests which expect the client environment (like credentials and ssh agent) to be in a fixed state.
 
-The [nlesc/xenon-fixed-client](https://hub.docker.com/r/nlesc/xenon-fixed-client/) Docker image is used as the fixed state client environment.
+The [xenonmiddleware/fixed-client](https://hub.docker.com/r/nlesc/xenon-fixed-client/) Docker image is used as the fixed state client environment.
 
 The fixed client environment tests can be run with:
 ```bash
 # change to root directory of Xenon repository
 ./src/fixedClientEnvironmentTest/resources/run-fixed-client-environment-test.sh
 ```
 
-The script will startup the [nlesc/xenon-fixed-client](https://hub.docker.com/r/nlesc/xenon-fixed-client/) Docker container which:
+The script will startup the [xenonmiddleware/fixed-client](https://hub.docker.com/r/nlesc/xenon-fixed-client/) Docker container which:
 * has the current code mounted
 * can communicate with Docker server, so tests can start filesystem/scheduler containers
 * can connect to host local ports, so tests can connect to filesystem/scheduler containers

gradle/test.gradle

@@ -6,7 +6,7 @@
 
 liveTest.description = 'Runs the integration tests against live systems'
 integrationTest.description = 'Run the integration tests against docker containers'
-fixedClientEnvironmentTest.description = 'Run the integration tests within and against docker containers, should be run within `nlesc/xenon-fixed-client` docker container'
+fixedClientEnvironmentTest.description = 'Run the integration tests within and against docker containers, should be run within `xenonmiddleware/fixed-client` docker container'
 
 // Never up to date, can not verify same config/props/remote is used second time
 liveTest.outputs.upToDateWhen {

src/fixedClientEnvironmentTest/resources/run-fixed-client-environment-test.sh

@@ -27,5 +27,5 @@ docker run \
 --volume $PWD:/code \
 --tty --interactive --rm \
 --name=xenon-fixed-client \
-nlesc/xenon-fixed-client \
+xenonmiddleware/fixed-client \
 ./gradlew --no-daemon fixedClientEnvironmentTest "$@"

src/integrationTest/resources/docker-compose/ftp.yml

@@ -17,7 +17,7 @@
 version: '3'
 services:
   ftp:
-    image: nlesc/xenon-ftp
+    image: xenonmiddleware/ftp
     ports:
     - 21
     - "3000-3100:3000-3100"

src/integrationTest/resources/docker-compose/gridengine-6.2.yml

@@ -18,7 +18,7 @@
 version: '3'
 services:
   gridengine:
-    image: nlesc/xenon-gridengine
+    image: xenonmiddleware/gridengine
     hostname: xenon-gridengine
     ports:
     - 22 # ssh

src/integrationTest/resources/docker-compose/openssh.yml

@@ -17,6 +17,6 @@
 version: '3'
 services:
   ssh:
-    image: nlesc/xenon-ssh
+    image: xenonmiddleware/ssh
     ports:
     - 22

src/integrationTest/resources/docker-compose/slurm-14.yml

@@ -17,7 +17,7 @@
 --- 
 services: 
   slurm: 
-    image: nlesc/xenon-slurm:14
+    image: xenonmiddleware/slurm:14
     ports: 
       - 22
       - 6817

src/integrationTest/resources/docker-compose/slurm-15.yml

@@ -17,7 +17,7 @@
 --- 
 services: 
   slurm: 
-    image: nlesc/xenon-slurm:15
+    image: xenonmiddleware/slurm:15
     ports: 
       - 22
       - 6817

src/integrationTest/resources/docker-compose/slurm-16.yml

@@ -17,7 +17,7 @@
 --- 
 services: 
   slurm: 
-    image: nlesc/xenon-slurm:16
+    image: xenonmiddleware/slurm:16
     ports: 
       - 22
       - 6817

src/integrationTest/resources/docker-compose/slurm-17.yml

@@ -17,7 +17,7 @@
 --- 
 services: 
   slurm: 
-    image: nlesc/xenon-slurm:17
+    image: xenonmiddleware/slurm:17
     ports: 
       - 22
       - 6817

src/integrationTest/resources/docker-compose/ssh-tunnel.yml

@@ -20,21 +20,21 @@ services:
   ssh1:
 #    healthcheck:
 #       disable: true
-    image: nlesc/xenon-ssh
+    image: xenonmiddleware/ssh
     hostname: ssh1
     ports:
     - "1000:22" # ssh
   ssh2:
 #    healthcheck:
 #       disable: true
-    image: nlesc/xenon-ssh
+    image: xenonmiddleware/ssh
     hostname: ssh2
     ports:
     - "2000:22" # ssh
   ssh3:
 #    healthcheck:
 #       disable: true
-    image: nlesc/xenon-ssh
+    image: xenonmiddleware/ssh
     hostname: ssh3
     ports:
     - "3000:22" # ssh

src/integrationTest/resources/docker-compose/torque-5.0.0.yml

@@ -18,7 +18,7 @@
 version: '3'
 services:
   torque:
-    image: nlesc/xenon-torque
+    image: xenonmiddleware/torque
     hostname: xenon-torque
     ports:
     - 22 # ssh

src/integrationTest/resources/docker-compose/webdav.yml

@@ -17,7 +17,7 @@
 version: '3'
 services:
   webdav:
-    image: nlesc/xenon-webdav
+    image: xenonmiddleware/webdav
     ports:
     - 80
     - 443