projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
715789d
)
17757: On our compute node images, Docker should not start by default;
author
Ward Vandewege <ward@curii.com>
Fri, 4 Jun 2021 15:22:47 +0000
(11:22 -0400)
committer
Ward Vandewege <ward@curii.com>
Fri, 4 Jun 2021 15:22:47 +0000
(11:22 -0400)
ensure-encrypted-partitions.sh takes care of starting it.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
tools/compute-images/scripts/base.sh
patch
|
blob
|
history
diff --git
a/tools/compute-images/scripts/base.sh
b/tools/compute-images/scripts/base.sh
index 5ec67b92cc757d8a6db3f3fb6026eefa8f02cc40..af01cde38e0c1659f5032dc39e67a5968bb018fb 100644
(file)
--- 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