Merge "Migrate docs jobs to use lf-infra-publish"

[releng/builder.git] / jenkins-scripts / docker.sh

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index 643b534f5a07135d8a271da8f845ab98e94b9c60..d8963184cb5017fc49366cdeb0968e4f6bfa821c 100755 (executable)
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -1,6 +1,17 @@
 #!/bin/bash
 
-/usr/sbin/usermod -a -G docker jenkins
+# make sure we don't require tty for sudo operations
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
+EOF
 
-# vim: sw=2 ts=2 sts=2 et :
+# make sure jenkins is part of the docker only if jenkins has already been
+# created
+
+if grep -q jenkins /etc/passwd
+then
+  /usr/sbin/usermod -a -G docker jenkins
+fi
 
+# vim: sw=2 ts=2 sts=2 et :