Bump swarm image version to 1.2; add Consul Compose file

This commit is contained in:
Jérôme Petazzoni
2016-04-21 10:01:52 +00:00
parent 2b213a9821
commit 52a2e6f3e6
2 changed files with 13 additions and 1 deletions

View File

@@ -3,7 +3,7 @@ unset DOCKER_REGISTRY
unset DOCKER_HOST
unset COMPOSE_FILE
SWARM_IMAGE=${SWARM_IMAGE:-jpetazzo/swarm:1.1.3-rc2-debug-experimental}
SWARM_IMAGE=${SWARM_IMAGE:-swarm:1.2.0}
prepare_1_check_ssh_keys () {
for N in $(seq 1 5); do

12
consul/docker-compose.yml Normal file
View File

@@ -0,0 +1,12 @@
version: "2"
services:
bootstrap:
image: jpetazzo/consul
command: agent -server -bootstrap
container_name: bootstrap
server:
image: jpetazzo/consul
command: agent -server -join bootstrap -join server
client:
image: jpetazzo/consul
command: members -rpc-addr server:8400