From 23410ebd3e2fbf6b2a803ea7e437bf51a2481fef Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 6 Jun 2016 18:06:53 -0300 Subject: [test] fix docker makefile target for running client test --- scripts/docker/Makefile | 10 ++++------ 1 file 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 -- cgit v1.2.3