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 3f41aac0632b769fa2d4f8fbc0cec08581d2f032..d8963184cb5017fc49366cdeb0968e4f6bfa821c 100755 (executable)
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -3,13 +3,13 @@
 # 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
+jenkins     ALL = NOPASSWD: ALL
 EOF
 
 # make sure jenkins is part of the docker only if jenkins has already been
 # created
-grep -q jenkins /etc/passwd
-if [ "$?" == '0' ]
+
+if grep -q jenkins /etc/passwd
 then
   /usr/sbin/usermod -a -G docker jenkins
 fi