From 02e9723155a990b8fbb6fda56645f1681d02912b Mon Sep 17 00:00:00 2001 From: James Oliver Date: Fri, 10 Feb 2017 10:31:52 -0700 Subject: [PATCH] semver, support all versions 1.13 and older --- infra-templates/swarm/3/README.md | 2 +- infra-templates/swarm/3/docker-compose.yml | 4 ++-- infra-templates/swarm/3/rancher-compose.yml | 2 +- infra-templates/swarm/config.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/infra-templates/swarm/3/README.md b/infra-templates/swarm/3/README.md index 4cf94dd..2ec2bce 100644 --- a/infra-templates/swarm/3/README.md +++ b/infra-templates/swarm/3/README.md @@ -1,6 +1,6 @@ ## Prerequisites -* Docker 1.13.x +* Docker 1.13 or later * Port `2377` and `2378` must be open ## Features diff --git a/infra-templates/swarm/3/docker-compose.yml b/infra-templates/swarm/3/docker-compose.yml index 496813f..e18218c 100644 --- a/infra-templates/swarm/3/docker-compose.yml +++ b/infra-templates/swarm/3/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: swarmkit-mon: - image: rancher/swarmkit:v1.13-1 + image: rancher/swarmkit:v1.13.0-beta.1 environment: MANAGER_SCALE: ${MANAGER_SCALE} labels: @@ -9,7 +9,7 @@ services: io.rancher.container.create_agent: 'true' io.rancher.container.dns: 'true' io.rancher.container.pull_image: always - io.rancher.scheduler.affinity:host_label: io.rancher.host.docker_version=1.13 + io.rancher.scheduler.affinity:host_label_ne: io.rancher.host.docker_version=1.12 io.rancher.scheduler.global: 'true' network_mode: host privileged: true diff --git a/infra-templates/swarm/3/rancher-compose.yml b/infra-templates/swarm/3/rancher-compose.yml index e02b0ab..a7ff20b 100644 --- a/infra-templates/swarm/3/rancher-compose.yml +++ b/infra-templates/swarm/3/rancher-compose.yml @@ -1,5 +1,5 @@ .catalog: - version: v1.13-beta.1 + version: v1.13.0-beta.1 minimum_rancher_version: 1.2.2 questions: - variable: MANAGER_SCALE diff --git a/infra-templates/swarm/config.yml b/infra-templates/swarm/config.yml index 4e5b3be..ffe27ee 100644 --- a/infra-templates/swarm/config.yml +++ b/infra-templates/swarm/config.yml @@ -1,5 +1,5 @@ name: SwarmKit description: > A toolkit for orchestrating distributed systems at any scale -version: v1.13-beta.1 +version: v1.13.0-beta.1 category: Orchestration