diff options
| author | drebs <drebs@leap.se> | 2016-06-06 18:06:53 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-06-06 21:40:42 -0300 |
| commit | 23410ebd3e2fbf6b2a803ea7e437bf51a2481fef (patch) | |
| tree | 42cec71cd94ec89f41a320acec724e5ef98da80e /scripts/docker/Makefile | |
| parent | 6b34d775613676b2411e1150645a4601c7b3ea46 (diff) | |
[test] fix docker makefile target for running client test
Diffstat (limited to 'scripts/docker/Makefile')
| -rw-r--r-- | scripts/docker/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 7a80fe02..b9432e8a 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -17,14 +17,12 @@ run-server: image $(IMAGE_NAME) \ /usr/local/soledad/start-server.sh -# TODO: the following rule does not work for now, we have to add a -# `start-test.sh` file -run-test: image +run-client-test: image container_id=`cat $(CONTAINER_ID_FILE)`; \ server_ip=`./helper/get-container-ip.sh $${container_id}`; \ - docker run \ + docker run -t -i \ --env="SOLEDAD_REMOTE=https://0xacab.org/leap/soledad.git" \ --env="SOLEDAD_BRANCH=develop" \ - --env="SOLEDAD_SERVER_IP=$${server_ip}" \ + --env="SOLEDAD_SERVER_URL=http://$${server_ip}:2424" \ $(IMAGE_NAME) \ - /usr/local/soledad/start-test.sh + /usr/local/soledad/start-client-test.sh |