Rearrange the user creation step for slaves

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

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index 365dc9574d52a63c4162767bad93995b4149ed1e..c70408da3e7fed32ac3c91361c6db9efbd632948 100755 (executable)
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -6,7 +6,13 @@ Defaults:jenkins !requiretty
 jenkins     ALL = NOPASSWD: /sbin/ifconfig
 EOF
 
-/usr/sbin/usermod -a -G docker jenkins
+# 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
 
 # stop firewall
 systemctl stop firewalld