Update test runner

Author: michielbdejong

run-solid-test-suite.sh

@@ -5,28 +5,40 @@ set -e
 docker network create testnet
 
 # Build and start Nextcloud server with code from current repo contents:
-docker build -t server .
+docker build --no-cache -t standalone-solid-server .
 
 docker build -t webid-provider https://github.com/pdsinterop/test-suites.git#master:/testers/webid-provider
-docker build -t cookie         https://github.com/pdsinterop/test-suites.git#master:servers/php-solid-server/cookie
-wget -O /tmp/env-vars-for-test-image.list https://raw.githubusercontent.com/pdsinterop/test-suites/master/servers/php-solid-server/env.list
-docker run -d --name server --network=testnet --env-file /tmp/env-vars-for-test-image.list server
+#docker build -t solid-crud https://github.com/solid/test-suite.git#master:/testers/solid-crud
+docker build --no-cache -t solid-crud https://github.com/solid/test-suite.git#master:/testers/solid-crud
+docker build -t cookie         https://github.com/solid/test-suite.git#master:helpers/cookie
+docker build -t pubsub-server  https://github.com/pdsinterop/php-solid-pubsub-server.git#master
+
+# wget -O /tmp/env-vars-for-test-image.list https://raw.githubusercontent.com/pdsinterop/test-suites/master/servers/php-solid-server/env.list
+curl https://raw.githubusercontent.com/pdsinterop/test-suites/master/servers/php-solid-server/env.list -o /tmp/env-vars-for-test-image.list
+
+docker run -d --name server --network=testnet --env-file /tmp/env-vars-for-test-image.list standalone-solid-server
+
+docker run -d --name pubsub --network=testnet pubsub-server
 
 until docker run --rm --network=testnet webid-provider curl -kI https://server 2> /dev/null > /dev/null
 do
   echo Waiting for server to start, this can take up to a minute ...
   docker ps -a
-  docker logs server || true
+  docker logs server
   sleep 1
 done
 docker ps -a
 docker logs server
 
 echo Getting cookie...
-export COOKIE="`docker run --cap-add=SYS_ADMIN --network=testnet --env-file /tmp/env-vars-for-test-image.list cookie`"
+export COOKIE="`docker run --rm --cap-add=SYS_ADMIN --network=testnet -e SERVER_TYPE=php-solid-server --env-file /tmp/env-vars-for-test-image.list cookie`"
+
 echo "Running webid-provider tests with cookie $COOKIE"
 docker run --rm --network=testnet --env COOKIE="$COOKIE" --env-file /tmp/env-vars-for-test-image.list webid-provider
-# rm /tmp/env-vars-for-test-image.list
-# docker stop server
-# docker rm server
-# docker network remove testnet
+# docker run --rm --network=testnet --env-file /tmp/env-vars-for-test-image.list solid-crud
+rm /tmp/env-vars-for-test-image.list
+docker stop server
+docker rm server
+docker stop pubsub
+docker rm pubsub
+docker network remove testnet