18682: update docker-formula version in the installer

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index 48cd0506ca6c1d24267cfbb9c1a0ecc86b131084..e93c01ba61059340d00bdc446a3a47deeb28e67c 100644 (file)
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -121,6 +121,6 @@ RELEASE="production"
 # ARVADOS_TAG="2.2.0"
 # POSTGRES_TAG="v0.44.0"
 # NGINX_TAG="v2.8.0"
-# DOCKER_TAG="v2.0.7"
+# DOCKER_TAG="v2.4.0"
 # LOCALE_TAG="v0.3.4"
 # LETSENCRYPT_TAG="v2.1.0"

diff --git a/tools/salt-install/local.params.example.single_host_multiple_hostnames b/tools/salt-install/local.params.example.single_host_multiple_hostnames
index e0b053ed0984c83d083f8c515b0176e2d5dfe7e6..886210b559ffcae70a850c183f123bcd846e7205 100644 (file)
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -97,6 +97,6 @@ RELEASE="production"
 # ARVADOS_TAG="2.2.0"
 # POSTGRES_TAG="v0.44.0"
 # NGINX_TAG="v2.8.0"
-# DOCKER_TAG="v2.0.7"
+# DOCKER_TAG="v2.4.0"
 # LOCALE_TAG="v0.3.4"
 # LETSENCRYPT_TAG="v2.1.0"

diff --git a/tools/salt-install/local.params.example.single_host_single_hostname b/tools/salt-install/local.params.example.single_host_single_hostname
index ed32279a9424322016c451c1c803d812dc0e12df..998c4a3ab6bb0fad32ccb8e1c9b69c66733e30cc 100644 (file)
--- a/tools/salt-install/local.params.example.single_host_single_hostname
+++ b/tools/salt-install/local.params.example.single_host_single_hostname
@@ -84,6 +84,6 @@ RELEASE="production"
 # ARVADOS_TAG="2.2.0"
 # POSTGRES_TAG="v0.44.0"
 # NGINX_TAG="v2.8.0"
-# DOCKER_TAG="v2.0.7"
+# DOCKER_TAG="v2.4.0"
 # LOCALE_TAG="v0.3.4"
 # LETSENCRYPT_TAG="v2.1.0"

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index cb0fc60b37c448dc433df4471fd700d2f5d3bbaa..67a171fc4ea067f1c4856616d5f42ac288b687bf 100755 (executable)
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -206,7 +206,7 @@ VERSION="latest"
 # Other formula versions we depend on
 POSTGRES_TAG="v0.44.0"
 NGINX_TAG="v2.8.0"
-DOCKER_TAG="v2.0.7"
+DOCKER_TAG="v2.4.0"
 LOCALE_TAG="v0.3.4"
 LETSENCRYPT_TAG="v2.1.0"