Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update Ubuntu docker image"
[releng/builder.git]
/
jenkins-scripts
/
docker.sh
diff --git
a/jenkins-scripts/docker.sh
b/jenkins-scripts/docker.sh
index 38633a891f15977763a368e4f35bcc1e4ab7e7e4..d8963184cb5017fc49366cdeb0968e4f6bfa821c 100755
(executable)
--- a/
jenkins-scripts/docker.sh
+++ b/
jenkins-scripts/docker.sh
@@
-1,9
+1,17
@@
#!/bin/bash
#!/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
-#
stop firewall
-
systemctl stop firewall
d
+#
make sure jenkins is part of the docker only if jenkins has already been
+
# create
d
-# vim: sw=2 ts=2 sts=2 et :
+if grep -q jenkins /etc/passwd
+then
+ /usr/sbin/usermod -a -G docker jenkins
+fi
+# vim: sw=2 ts=2 sts=2 et :