kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #509 from aboch/pc

Browse source 
Remove stale consul container first
This commit is contained in:
Jana Radhakrishnan 2015-09-09 18:18:33 -07:00
commit ebae95a705
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnetwork/test/integration/dnet/helpers.bash
View file

@ -1,17 +1,19 @@
function start_consul() { function start_consul() {
stop_consul
docker run -d --name=pr_consul -p 8500:8500 -p 8300-8302:8300-8302/tcp -p 8300-8302:8300-8302/udp -h consul progrium/consul -server -bootstrap docker run -d --name=pr_consul -p 8500:8500 -p 8300-8302:8300-8302/tcp -p 8300-8302:8300-8302/udp -h consul progrium/consul -server -bootstrap
sleep 2 sleep 2
} }
function stop_consul() { function stop_consul() {
docker stop pr_consul docker stop pr_consul || true
# You cannot destroy a container in Circle CI. So do not attempt destroy in circleci # You cannot destroy a container in Circle CI. So do not attempt destroy in circleci
if [ -z "$CIRCLECI" ]; then if [ -z "$CIRCLECI" ]; then
docker rm pr_consul docker rm -f pr_consul || true
fi fi
} }
function start_dnet() { function start_dnet() {
stop_dnet $1
name="dnet-$1" name="dnet-$1"
hport=$((41000+${1}-1)) hport=$((41000+${1}-1))
@ -38,11 +40,11 @@ EOF
function stop_dnet() { function stop_dnet() {
name="dnet-$1" name="dnet-$1"
rm -rf /tmp/dnet/${name} rm -rf /tmp/dnet/${name} || true
docker stop ${name} docker stop ${name} || true
# You cannot destroy a container in Circle CI. So do not attempt destroy in circleci # You cannot destroy a container in Circle CI. So do not attempt destroy in circleci
if [ -z "$CIRCLECI" ]; then if [ -z "$CIRCLECI" ]; then
docker rm ${name} || true docker rm -f ${name} || true
fi fi
} }