[ARVADOS] updated: 2.1.0-871-ge3325e6bc
Git user
git at public.arvados.org
Fri Jun 4 21:31:54 UTC 2021
Summary of changes:
tools/compute-images/scripts/base.sh | 4 ++++
1 file changed, 4 insertions(+)
via e3325e6bc9121649344588595ceba7f2ce2e70a8 (commit)
from b282ac0a0bf9985b8ce6565eaf4428abcba5fdcc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit e3325e6bc9121649344588595ceba7f2ce2e70a8
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
--
More information about the arvados-commits
mailing list