Skip to content

Commit b622afd

Browse files
Use local docker images
1 parent f36084e commit b622afd

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

test/surface/run-solid-test-suite.sh

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ set -e
44
docker network create testnet
55
docker build -t server test/surface/docker/server
66
docker build -t cookie test/surface/docker/cookie
7-
docker build -t webid-provider https://github.com/solid/test-suite.git#master:/testers/webid-provider
8-
docker build -t solid-crud https://github.com/solid/test-suite.git#master:/testers/solid-crud
9-
docker build -t web-access-control https://github.com/solid/test-suite.git#master:/testers/web-access-control
7+
8+
docker build -t webid-provider test/surface/docker/webid-provider
9+
docker build -t solid-crud test/surface/docker/solid-crud
10+
docker build -t web-access-control test/surface/docker/web-access-control
11+
1012
docker run -d --env-file test/surface/server-env.list --name server --network=testnet -v `pwd`:/travis -w /node-solid-server server /travis/bin/solid-test start --config-file /node-solid-server/config.json
1113
docker run -d --env-file test/surface/thirdparty-env.list --name thirdparty --network=testnet -v `pwd`/test/surface:/surface server /node-solid-server/bin/solid-test start --config-file /surface/thirdparty-config.json
1214

@@ -28,11 +30,12 @@ done
2830

2931
docker ps -a
3032
docker logs server
33+
3134
export COOKIE_ALICE="`docker run --rm -e SERVER_ROOT="https://server" --network=testnet cookie`"
3235
export COOKIE_BOB="`docker run --rm -e SERVER_ROOT="https://thirdparty" --network=testnet cookie`"
3336

3437
docker run --rm --network=testnet --env COOKIE="$COOKIE_ALICE" --env-file test/surface/webid-provider-tests-env.list webid-provider
35-
# docker run --rm --network=testnet --env COOKIE="$COOKIE" --env-file /tmp/env-vars-for-test-image.list solid-crud
38+
# docker run --rm --network=testnet --env COOKIE="$COOKIE_ALICE" --env-file test/surface/solid-crud-tests-env.list solid-crud
3639
docker run --rm --network=testnet --env COOKIE_ALICE="$COOKIE_ALICE" --env COOKIE_BOB="$COOKIE_BOB" --env-file test/surface/web-access-control-tests-env.list web-access-control
3740

3841
docker stop server
+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALICE_WEBID=https://server/profile/card#me
2+
SERVER_ROOT=https://server
3+
USERNAME=alice
4+
PASSWORD=123

0 commit comments

Comments
 (0)