From: Javier Bértoli <jbertoli@curii.com>
Date: Wed, 25 Nov 2020 02:02:31 +0000 (-0300)
Subject: fix(docker): formula upgraded
X-Git-Tag: 2.2.0~212^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/76928023247b3350e33a380e62d9aff286f528ae

fix(docker): formula upgraded

refs #17146, #17147, #17150

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

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 91cb398943..a207d01987 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -168,6 +168,7 @@ cat > ${P_DIR}/top.sls << EOFPSLS
 base:
   '*':
     - arvados
+    - docker
     - locale
     - nginx_api_configuration
     - nginx_controller_configuration
diff --git a/tools/salt-install/single_host/docker.sls b/tools/salt-install/single_host/docker.sls
new file mode 100644
index 0000000000..54d2256159
--- /dev/null
+++ b/tools/salt-install/single_host/docker.sls
@@ -0,0 +1,9 @@
+---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+docker:
+  pkg:
+    docker:
+      use_upstream: package