X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/482dc81f2b7533043bc5195bded942f970f163d8..8b278cdd80f8969a954a2c789281f8f63195e894:/services/dockercleaner/arvados-docker-cleaner.service diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service index 28653ae24e..031058242a 100644 --- a/services/dockercleaner/arvados-docker-cleaner.service +++ b/services/dockercleaner/arvados-docker-cleaner.service @@ -6,9 +6,14 @@ AssertPathExists=/etc/arvados/docker-cleaner/docker-cleaner.json [Service] Type=simple -ExecStart=/usr/bin/env arvados-docker-cleaner Restart=always RestartSec=10s +RestartPreventExitStatus=2 +# +# This unwieldy ExecStart command detects at runtime whether +# arvados-docker-cleaner is installed with the Python 3.3 Software +# Collection, and if so, invokes it with the "scl" wrapper. +ExecStart=/bin/sh -c 'if [ -e /opt/rh/python33/root/bin/arvados-docker-cleaner ]; then exec scl enable python33 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi' [Install] WantedBy=multi-user.target