From dd1de2bc9e4d6de7ffb7192dede23fcc68618510 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 10 Aug 2016 11:49:55 -0700 Subject: [PATCH 1/2] Fix travis --- tests/boulder-fetch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/boulder-fetch.sh b/tests/boulder-fetch.sh index 469c5cd80..0c0a8009b 100755 --- a/tests/boulder-fetch.sh +++ b/tests/boulder-fetch.sh @@ -5,6 +5,6 @@ set -xe # Check out special branch until latest docker changes land in Boulder master. git clone -b docker-integration https://github.com/letsencrypt/boulder $BOULDERPATH cd $BOULDERPATH -sed -i 's/FAKE_DNS: .*/FAKE_DNS: 172.17.42.1/' docker-compose.yml +FAKE_DNS=$(ifconfig docker0 | grep "inet addr:" | cut -d: -f2 | awk '{ print $1}') +sed -i "s/FAKE_DNS: .*/FAKE_DNS: $FAKE_DNS/" docker-compose.yml docker-compose up -d - From fd1629e347a3fce7cf2bc63b7e05063e3d294cd8 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 10 Aug 2016 11:51:12 -0700 Subject: [PATCH 2/2] Make letstest docker ip more robust --- tests/letstest/scripts/boulder_install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/letstest/scripts/boulder_install.sh b/tests/letstest/scripts/boulder_install.sh index 7e298783f..f997268bd 100755 --- a/tests/letstest/scripts/boulder_install.sh +++ b/tests/letstest/scripts/boulder_install.sh @@ -5,5 +5,6 @@ # Check out special branch until latest docker changes land in Boulder master. git clone -b docker-integration https://github.com/letsencrypt/boulder $BOULDERPATH cd $BOULDERPATH -sed -i 's/FAKE_DNS: .*/FAKE_DNS: 172.17.42.1/' docker-compose.yml +FAKE_DNS=$(ifconfig docker0 | grep "inet addr:" | cut -d: -f2 | awk '{ print $1}') +sed -i "s/FAKE_DNS: .*/FAKE_DNS: $FAKE_DNS/" docker-compose.yml docker-compose up -d