[ARVADOS] created: 2.1.0-887-gb5178b3f9

[Git user]

        at  b5178b3f99de705e2afcdc91f763f779481131cb (commit)


commit b5178b3f99de705e2afcdc91f763f779481131cb
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Jun 4 11:22:47 2021 -0400

    17757: On our compute node images, Docker should not start by default;
           ensure-encrypted-partitions.sh takes care of starting it.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index 5ec67b92c..af01cde38 100644
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -89,6 +89,10 @@ $SUDO sed "s/ExecStart=\(.*\)/ExecStart=\1 --default-ulimit nofile=10000:10000 $
 
 $SUDO systemctl daemon-reload
 
+# docker should not start on boot: we restart it inside /usr/local/bin/ensure-encrypted-partitions.sh,
+# and the BootProbeCommand defaults to "docker ps -q"
+$SUDO systemctl disable docker
+
 # Make sure user_allow_other is set in fuse.conf
 $SUDO sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf
 

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


hooks/post-receive
--