Skip to content

Commit e3afdbc

Browse files
committed
Simplify setup for 1.12.0-rc2
1 parent 34dc5ab commit e3afdbc

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

swarm/buildswarm-do.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#!/bin/bash
2-
LINK=https://test.docker.com/builds/Linux/x86_64/docker-1.12.0-rc1.tgz
3-
42
SIZE=2gb
53
REGION=ams2
64
IMAGE=ubuntu-15-10-x64
@@ -15,8 +13,8 @@ docker-machine create \
1513
--digitalocean-region=${REGION} \
1614
--digitalocean-private-networking=true \
1715
--digitalocean-image=${IMAGE} \
16+
--engine-install-url=https://test.docker.com \
1817
${PREFIX}-sw01
19-
echo "sudo /etc/init.d/docker stop && curl $LINK | tar xzf - && sudo mv docker/* /usr/bin && rm -rf docker/ && sudo /etc/init.d/docker start" | docker-machine ssh ${PREFIX}-sw01 sh -
2018
docker-machine ssh ${PREFIX}-sw01 docker swarm init
2119

2220
# create another swarm node
@@ -27,8 +25,8 @@ docker-machine create \
2725
--digitalocean-region=${REGION} \
2826
--digitalocean-private-networking=true \
2927
--digitalocean-image=${IMAGE} \
28+
--engine-install-url=https://test.docker.com \
3029
${PREFIX}-sw02
31-
echo "sudo /etc/init.d/docker stop && curl $LINK | tar xzf - && sudo mv docker/* /usr/bin && rm -rf docker/ && sudo /etc/init.d/docker start" | docker-machine ssh ${PREFIX}-sw02 sh -
3230
docker-machine ssh ${PREFIX}-sw02 docker swarm join $(docker-machine ip ${PREFIX}-sw01):2377
3331

3432
# list nodes

swarm/buildswarm-vbox.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
#!/bin/bash
2-
LINK=https://test.docker.com/builds/Linux/x86_64/docker-1.12.0-rc1.tgz
2+
URL=https://github.com/boot2docker/boot2docker/releases/download/v1.12.0-rc2/boot2docker.iso
33

44
# create swarm manager
5-
docker-machine create -d virtualbox sw01
6-
echo "sudo /etc/init.d/docker stop && curl $LINK | tar xzf - && sudo mv docker/* /usr/local/bin && rm -rf docker/ && sudo /etc/init.d/docker start" | docker-machine ssh sw01 sh -
5+
docker-machine create -d virtualbox --virtualbox-boot2docker-url $URL sw01
76
docker-machine ssh sw01 docker swarm init
87

98
# create another swarm node
10-
docker-machine create -d virtualbox sw02
11-
echo "sudo /etc/init.d/docker stop && curl $LINK | tar xzf - && sudo mv docker/* /usr/local/bin && rm -rf docker/ && sudo /etc/init.d/docker start" | docker-machine ssh sw02 sh -
9+
docker-machine create -d virtualbox --virtualbox-boot2docker-url $URL sw02
1210
docker-machine ssh sw02 docker swarm join $(docker-machine ip sw01):2377
1311

1412
# list nodes

0 commit comments

Comments
 (0)