Arvados

Submit PR commit 99524c2ef@arvados, branch 17438-compute-images-script-fixes

Javier Bértoli wrote:

Submit PR commit 99524c2ef@arvados, branch 17438-compute-images-script-fixes

This code doesn't seem right, the sed is just going to create an empty file because there is nothing on its stdin (and the -i flag was removed).

-# Set a higher ulimit for docker
-$SUDO sed -i "s/ExecStart=\(.*\)/ExecStart=\1 --default-ulimit nofile=10000:10000 --dns ${RESOLVER}/g" /lib/systemd/system/docker.service
+# Set a higher ulimit and the resolver (if set) for docker
+if [ "x$RESOLVER" != "x" ]; then
+  SET_RESOLVER="--dns ${RESOLVER}" 
+fi
+
+$SUDO sed "s/ExecStart=\(.*\)/ExecStart=\1 --default-ulimit nofile=10000:10000 ${SET_RESOLVER}/g" > /etc/systemd/system/docker.service

Instead, I think you want to drop a new file in `/etc/systemd/system/docker.service.d/`, with just these contents:

[Service]
ExecStart=
ExecStart=(copy from /lib/systemd/system/docker.service at image generation time, and modify like in the sed line from the script)

Note that we need to clear the existing ExecStart value (it is parsed as a list), which is what the empty assignment is for on line 2.

Or you can copy the file from `/lib/systemd/system/` to `/etc/systemd/system/` like you were planning and edit it in place.

LGTM at 06fac7e369df875da835e8bab1eff72c5188c9d8