From: Javier Bértoli <jbertoli@curii.com>
Date: Thu, 10 Feb 2022 16:38:56 +0000 (-0300)
Subject: 18682: update docker-formula version in the installer
X-Git-Tag: 2.4.0~63^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e07aa2904986362d5881353eee1df8f2a61a82e4

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 48cd0506ca..e93c01ba61 100644
--- 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 e0b053ed09..886210b559 100644
--- 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 ed32279a94..998c4a3ab6 100644
--- 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 cb0fc60b37..67a171fc4e 100755
--- 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"