[ARVADOS] created: 2.1.0-1860-gaddf38844

[Git user]

        at  addf38844896e204083c1e0eb69e5466c4733c02 (commit)


commit addf38844896e204083c1e0eb69e5466c4733c02
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Thu Jan 27 15:31:04 2022 -0300

    18632: fix docker pillar in provision script
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 83a538ee5..2ba92c3d4 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -691,7 +691,7 @@ else
         grep -q "docker" ${S_DIR}/top.sls       || echo "    - docker.software" >> ${S_DIR}/top.sls
         grep -q "arvados.${R}" ${S_DIR}/top.sls || echo "    - arvados.${R}" >> ${S_DIR}/top.sls
         # Pillars
-        grep -q "" ${P_DIR}/top.sls                             || echo "    - docker" >> ${P_DIR}/top.sls
+        grep -q "docker" ${P_DIR}/top.sls       || echo "    - docker" >> ${P_DIR}/top.sls
       ;;
       "dispatcher")
         # States

-----------------------------------------------------------------------


hooks/post-receive
--