Merge branch 'master' into gui

This commit is contained in:
Amjad Mashaal 2016-05-26 01:00:56 +02:00
commit 15d1bbe7b9
2 changed files with 2 additions and 2 deletions

View file

@ -3,7 +3,7 @@
set -xe
# Check out special branch until latest docker changes land in Boulder master.
git clone https://github.com/letsencrypt/boulder $BOULDERPATH
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
docker-compose up -d

View file

@ -3,7 +3,7 @@
# >>>> only tested on Ubuntu 14.04LTS <<<<
# Check out special branch until latest docker changes land in Boulder master.
git clone https://github.com/letsencrypt/boulder $BOULDERPATH
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
docker-compose up -d