Rearrange the user creation step for slaves

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

diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh
index 238f335e161f59677495b63e35003094faedc586..f2874de336e04742fa7c6b70d1c4c15aa65d808d 100755 (executable)
--- a/jenkins-scripts/create_jenkins_user.sh
+++ b/jenkins-scripts/create_jenkins_user.sh
@@ -4,9 +4,18 @@
 # Create Jenkins User #
 #######################
 
-OS=`facter operatingsystem | tr '[:upper:]' '[:lower:]'`
+OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
 
-useradd -m -s /bin/bash jenkins
+# Determine if we need to add jenkins to the docker group
+grep -q docker /etc/group
+if [ "$?" == '0' ]
+then
+  GROUP='-G docker'
+else
+  GROUP=''
+fi
+
+useradd -m ${GROUP} -s /bin/bash jenkins
 mkdir /home/jenkins/.ssh
 mkdir /w
 cp -r /home/${OS}/.ssh/authorized_keys /home/jenkins/.ssh/authorized_keys