Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit 67fd64c

Browse files
committed
fix broken test
1 parent fd1ef4b commit 67fd64c

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

requirements.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1-
python-dockercloud==1.0.4
1+
PyYAML==3.11
2+
cached-property==1.2.0
3+
docker-py==1.7.0
4+
dockerpty==0.4.1
5+
docopt==0.6.1
6+
enum34==1.0.4
7+
jsonschema==2.5.1
8+
texttable==0.8.4
9+
future==0.15.0
10+
requests==2.7.0
11+
six==1.9.0
12+
websocket-client==0.37.0
213
docker-compose==1.6.0
14+
python-dockercloud==1.0.4
315
gevent==1.1.1

tests/test_legacy_links.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ cleanup
4343
echo
4444

4545
echo "=> Building haproxy image"
46-
docker tag this haproxy || docker build -t haproxy .
46+
docker build -t haproxy .
4747
echo
4848

4949
echo "=> Creating certificates"
@@ -55,7 +55,7 @@ echo
5555

5656
echo "=> Docker Host Ip address"
5757
DOCKER_HOST_IP=${DOCKER_HOST_IP:-$1}
58-
if docker-machine ip $1; then
58+
if docker-machine ip $1 >/dev/null 2>&1; then
5959
DOCKER_HOST_IP=`docker-machine ip $1`
6060
fi
6161
DOCKER_HOST_IP=${DOCKER_HOST_IP:-"127.0.0.1"}

0 commit comments

Comments
 (0)