Update Minions table to use bootstrap theme

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

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index c3498df4182999d341ba459eef4ea96c4662a731..3f41aac0632b769fa2d4f8fbc0cec08581d2f032 100755 (executable)
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -1,12 +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: /sbin/ifconfig
+EOF
 
-# stop firewall
-systemctl stop firewalld
-
-# restart docker daemon - needed after firewalld stop
-systemctl restart docker
+# make sure jenkins is part of the docker only if jenkins has already been
+# created
+grep -q jenkins /etc/passwd
+if [ "$?" == '0' ]
+then
+  /usr/sbin/usermod -a -G docker jenkins
+fi
 
 # vim: sw=2 ts=2 sts=2 et :
-