clean up jenkins master/slave example

Author: bparees

examples/jenkins/master-slave/README.md

@@ -41,7 +41,7 @@ $ oc policy add-role-to-user edit system:serviceaccount:ci:default -n ci
 
 3. Install the provided OpenShift templates:
 ```
-# Slave convertor (optional):
+# Slave converter (optional):
 $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/master-slave/jenkins-slave-template.json
 
 # Jenkins master template:
@@ -55,7 +55,7 @@ $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/example
    alternative repository with your own custom entry point script.
 
 6. Click *Create* and navigate to *Browse/Builds*. You should see the build
-   running. Once this build finish, you should have the Jenkins Slave image
+   running. Once this build finishes, you should have the Jenkins Slave image
    ready to be used.
 
 7. Now click on *Add to project* again and select the `jenkins-master` template.

examples/jenkins/master-slave/jenkins-master-template.json

@@ -55,8 +55,7 @@
       "kind": "Route",
       "apiVersion": "v1",
       "metadata": {
-        "name": "jenkins",
-        "creationTimestamp": null
+        "name": "jenkins"
       },
       "spec": {
         "to": {
@@ -135,8 +134,7 @@
       "kind": "DeploymentConfig",
       "apiVersion": "v1",
       "metadata": {
-        "name": "${JENKINS_SERVICE_NAME}",
-        "creationTimestamp": null
+        "name": "${JENKINS_SERVICE_NAME}"
       },
       "spec": {
         "strategy": {
@@ -168,7 +166,6 @@
         },
         "template": {
           "metadata": {
-            "creationTimestamp": null,
             "labels": {
               "name": "${JENKINS_SERVICE_NAME}"
             }
@@ -248,8 +245,8 @@
           {
             "name": "jnlp",
             "protocol": "TCP",
-            "port": 49187,
-            "targetPort": 49187,
+            "port": 50000,
+            "targetPort": 50000,
             "nodePort": 0
           }
         ],

examples/jenkins/master-slave/slave/Dockerfile

@@ -9,14 +9,14 @@ RUN yum install -y --setopt=tsflags=nodocs --enablerepo=centosplus epel-release
     yum install -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all && \
-    mkdir -p /opt/app-root/jenkins && \
-    chown -R 1001:0 /opt/app-root/jenkins && \
-    chmod -R g+w /opt/app-root/jenkins
+    mkdir -p /home/jenkins && \
+    chown -R 1001:0 /home/jenkins && \
+    chmod -R g+w /home/jenkins
 
 # Copy the entrypoint
-COPY contrib/openshift/* /opt/app-root/jenkins/
+ADD contrib/openshift/* /usr/local/bin/
+
 USER 1001
 
-# Run the JNLP client by default
-# To use swarm client, specify "/opt/app-root/jenkins/run-swarm-client" as Command
-ENTRYPOINT ["/opt/app-root/jenkins/run-jnlp-client"]
+# Run the Jenkins JNLP client
+ENTRYPOINT ["/usr/local/bin/run-jnlp-client"]

examples/jenkins/master-slave/slave/contrib/openshift/generate_container_user

@@ -0,0 +1,17 @@
+# Set current user in nss_wrapper
+USER_ID=$(id -u)
+GROUP_ID=$(id -g)
+
+if [ x"$USER_ID" != x"0" -a x"$USER_ID" != x"1001" ]; then
+
+    NSS_WRAPPER_PASSWD=/tmp/nss_passwd
+    NSS_WRAPPER_GROUP=/etc/group
+
+    cat /etc/passwd | sed -e 's/^default:/builder:/' > $NSS_WRAPPER_PASSWD
+
+    echo "default:x:${USER_ID}:${GROUP_ID}:Default Application User:${HOME}:/sbin/nologin" >> $NSS_WRAPPER_PASSWD
+
+    export NSS_WRAPPER_PASSWD
+    export NSS_WRAPPER_GROUP
+    export LD_PRELOAD=libnss_wrapper.so
+fi

examples/jenkins/master-slave/slave/contrib/openshift/passwd.template

@@ -4,34 +4,23 @@
 # will use for the auto-discovery of this slave.
 #
 
+source /opt/app-root/jenkins/generate_container_user
+
 # The directory that Jenkins will execute the builds and store cache files.
 # The directory has to be writeable for the user that the container is running
 # under.
 export JENKINS_HOME=/opt/app-root/jenkins
 
-# Setup nss_wrapper so the random user OpenShift will run this container
-# has an entry in /etc/passwd.
-# This is needed for 'git' and other tools to work properly.
-#
-export USER_ID=$(id -u)
-export GROUP_ID=$(id -g)
-envsubst < ${JENKINS_HOME}/passwd.template > ${JENKINS_HOME}/passwd
-export LD_PRELOAD=libnss_wrapper.so
-export NSS_WRAPPER_PASSWD=${JENKINS_HOME}/passwd
-export NSS_WRAPPER_GROUP=/etc/group
-
 # Make sure the Java clients have valid $HOME directory set
 export HOME=${JENKINS_HOME}
 
 set -e
 
 # if `docker run` has 2 or more arguments the user is passing jenkins launcher arguments
 if [[ $# -gt 1 ]]; then
-  # TODO: We can attempt to download this file from the Jenkins server
   JAR="${JENKINS_HOME}/remoting.jar"
   PARAMS=""
 
-
   # if -url is not provided try env vars
   if [[ "$@" != *"-url "* ]]; then
     if [ ! -z "$JENKINS_URL" ]; then

examples/jenkins/master-slave/slave/contrib/openshift/run-jnlp-client

@@ -171,8 +171,7 @@
       "kind": "Service",
       "apiVersion": "v1",
       "metadata": {
-        "name": "jenkins-jnlp",
-        "creationTimestamp": null
+        "name": "jenkins-jnlp"
       },
       "spec": {
         "ports": [