polish

back to Jenkins LTS (2.73.2)
update docker / docker-compose
add ansible

Author: Springjunky

README.md

@@ -133,7 +133,10 @@ And _yes_ docker-plugin in jenkins works (docker in docker, usefull but not reco
 
 ### My next steps
 
-* give you some more preconfiguratiom
+* give you some more preconfiguration
+* ~~install docker~~
+* ~~install docker-compose~~
+* ~~install ansible~~
 * ~~apply a gitlab runner~~
 * apply git-lfs
 

docker-compose.yml.template

@@ -6,6 +6,11 @@
 # Consider to Backup  BASE_DATA_DIR
 #
 version: "3"
+
+networks:
+  devstacknetwork:
+    driver: bridge
+
 services: 
   ngnix:
      build: nginx-reverse
@@ -14,9 +19,13 @@ services:
        # SSH Bypassing into gitlab, if you want to change this edit nginx.conf also
        - "2222:2222"   #ssh port of gitlab (ssh://git@myhostname:2222/scott/foo.git)
        - "5555:5555"   #Gitlab Docker Registry do NOT use 5000, this is an internal PORT of the gitlab-ce Image
+     networks:
+       - devstacknetwork
   jenkins-fat:
     build: jenkins-fat
     dns: DNS_SERVER
+    networks:
+      - devstacknetwork
     volumes:
       - BASE_DATA_DIR/jenkins:/var/jenkins_home 
       - /var/run/docker.sock:/var/run/docker.sock
@@ -30,9 +39,13 @@ services:
       # This needs explicit mapping due to 
       # https://github.com/docker-library/postgres/blob/4e48e3228a30763913ece952c611e5e9b95c8759/Dockerfile.template#L52
       - BASE_DATA_DIR/sonar-db/postgresql_data:/var/lib/postgresql/data
+    networks:
+       - devstacknetwork
   sonar:
     image: sonarqube
     dns: DNS_SERVER
+    networks:
+       - devstacknetwork
     environment:
       - SONARQUBE_JDBC_URL=jdbc:postgresql://sonar-db:5432/sonar
     volumes:
@@ -43,6 +56,8 @@ services:
   gitlab:
     image: 'gitlab/gitlab-ce:latest'
     dns: DNS_SERVER
+    networks:
+      - devstacknetwork
     environment:
       GITLAB_OMNIBUS_CONFIG: |
         external_url 'http://HOSTNAME/gitlab'
@@ -68,19 +83,22 @@ services:
   gitlabrunner:
     build: gitlabrunner
     dns: DNS_SERVER
+    networks:
+       - devstacknetwork
     environment:
       - DOCKER_DNS=DNS_SERVER
       - GITLAB_URL=http://HOSTNAME/gitlab
       - REGISTER_TOKEN=s3cretToken4Runner
-      - REGISTER_MODE=KEEP #KEEP register a new runner an keep it. FRESH unregister all runners and always install a new (pipeline-history lost!)
+      - REGISTER_MODE=FRESH #KEEP register a new runner an keep it. FRESH unregister all runners and always install a new (pipeline-history lost!)
       - REGISTER_TRYS=60 # every 10 seconds a try to register the runner..gitlab takes a long time to startup
     volumes:
       - BASE_DATA_DIR/gitlab-runner/config:/etc/gitlab-runner
       - /var/run/docker.sock:/var/run/docker.sock
-  
   nexus:
     image: sonatype/nexus3
     dns: DNS_SERVER
+    networks:
+       - devstacknetwork
     environment:
       - NEXUS_CONTEXT=nexus
     volumes:

gitlabrunner/entrypointAutoregister

@@ -36,7 +36,7 @@ if test $REGISTER_MODE = "FRESH" -o  $RUNNER_IS_PRESENT -ne 0 ; then
     while test $TRYS -gt 0 -a $REGISTERED -gt 0 ; do
       TRYS=$(expr $TRYS - 1)
       gitlab-runner register -n --url=${GITLAB_URL} --registration-token=${REGISTER_TOKEN} \
-      --executor=docker --name=docker-runner \
+      --executor=docker --name=docker-multi-runner \
       --run-untagged=true --locked=false --docker-image=docker:latest \
       --docker-privileged 
       REGISTERED=$?
@@ -52,7 +52,7 @@ if test $REGISTER_MODE = "FRESH" -o  $RUNNER_IS_PRESENT -ne 0 ; then
         gitlab-runner verify --delete
         sleep 1
         gitlab-runner register -n --url=${GITLAB_URL} --registration-token=${REGISTER_TOKEN} \
-        --executor=docker --name=docker-runner \
+        --executor=docker --name=docker--multi-runner \
         --run-untagged=true --locked=false --docker-image=docker:latest \
         --docker-privileged 
       fi

jenkins-fat/Dockerfile

@@ -13,12 +13,21 @@ RUN apt-get install -y openjdk-8-jdk
 #------------ Tools f Jenkins and apt-get to use SSL Repositorys
 RUN apt-get install -y --no-install-recommends apt-utils git wget curl graphviz \
     apt-transport-https ca-certificates software-properties-common
+ #-----------------------------------------------
+#---------------  Ansible
+#-----------------------------------------------
+RUN  apt-add-repository ppa:ansible/ansible 2>/dev/null 
+RUN  apt-get update  &&  apt-get -y install ansible
+#--------------------------------------------    
 #------------ Docker
+#--------------------------------------------    
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg > docker-public-key && apt-key add docker-public-key && rm docker-public-key
 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 RUN apt-get update && apt-get install -y docker-ce
+#--------------------------------------------    
 #------------ Docker Compose
-RUN curl -o /usr/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.15.0/docker-compose-$(uname -s)-$(uname -m)" \
+#--------------------------------------------    
+RUN curl -o /usr/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.16.1/docker-compose-$(uname -s)-$(uname -m)" \
     && chmod +x /usr/bin/docker-compose
 
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
@@ -30,8 +39,7 @@ ENV GIT_SSL_NO_VERIFY=1
 #-----------------------------------------------
 #  install Oracle Java if you want ... and 
 #  remove the line "RUN apt-get install -y openjdk-8-jdk"
-# and uncomment the next lines
-#  above ... but openjdk is pretty good ! 
+# and uncomment the next lines above ... but openjdk is pretty good ! 
 #-----------------------------------------------
 #------------ Download
 # ## ENV filename jdk-8u131-linux-x64.tar.gz
@@ -63,9 +71,7 @@ ARG user=jenkins
 ARG group=jenkins
 ARG uid=1000
 ARG gid=1000
-# Jenkins is run with user `jenkins`, uid = 1000
-# If you bind mount a volume from the host or a data container, 
-# ensure you use the same uid
+# Jenkins is run with user `jenkins`, uid = 1000 If you bind mount a volume from the host or a data container,  ensure you use the same uid
 RUN groupadd -g ${gid} ${group} && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}
 # Jenkins home directory is a volume, so configuration and build history 
 # can be persisted and survive image upgrades
@@ -85,24 +91,34 @@ RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION
 COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy
 
 # jenkins version being bundled in this docker image 
+# This is the latest stable version
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.79}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.73.2}
 
-# jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=272e035475837b5e1c4efb84c8b65949e3f658a3
+#### jenkins.war checksum, download will be validated using it
+ARG JENKINS_SHA=1489e498f682e8b61ce4cf8124de200f264b087c
 
-# Can be used to customize where jenkins.war get downloaded from http://updates.jenkins-ci.org/download/war/2.79/jenkins.war
 ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
 
 # could use ADD but this one does not check Last-Modified header neither does it allow to control checksum 
 # see https://github.com/docker/docker/issues/8331
 RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war && echo "${JENKINS_SHA}  /usr/share/jenkins/jenkins.war" | sha1sum -c -
 
+#------------------ Optional lokal caching of files
+# Download jenkins with yout favorite browser and put the war in the current dir. 
+#COPY jenkins-war-2.73.2.war /usr/share/jenkins/jenkins.war
+###### # Copy all Cached plugins ...
+# to preLoad all Plugins listed in active-plugins.txt use the command
+#  ./preDownload.sh $(cat active-plugins.txt)
+# this will download all the plugins in th Folder Plugins
+# COPY Plugins/* /usr/share/jenkins/ref/plugins/
+#------------------ Optional lokal caching of files end block
 
 ENV JENKINS_UC https://updates.jenkins.io
+ENV JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental
 RUN chown -R ${user} "$JENKINS_HOME" /usr/share/jenkins/ref
 
-# for main web interface:
+# for main web interface, reversed-proxied by nginx
 EXPOSE 8080
 
 ENV COPY_REFERENCE_FILE_LOG $JENKINS_HOME/copy_reference_file.log
@@ -115,24 +131,25 @@ COPY jenkins.sh /usr/local/bin/jenkins.sh
 ENV JAVA_OPTIONS="-Djava.awt.headless=true -Dhudson.security.csrf.requestfield=crumb"
 
 ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
-#-----------------------------------------------
-# get all Plugins from existing Jenins
-#-----------------------------------------------
+#-------------------------------------------------------------------------
+# get all Plugins from existing Jenins without Version (latest is used)
+#--------------------------------------------------------------------------
 # JENKINS_HOST=username:password@myhost.com:port
-# curl -sSL "http://$JENKINS_HOST/pluginManager/api/xml?depth=1&xpath=/*/*/shortName|/*/*/version&wrapper=plugins" | perl -pe 's/.*?<shortName>([\w-]+).*?<version>([^<]+)()(<\/\w+>)+/\1 \2\n/g'|sed 's/ /:/'
+# curl -sSL "http://$JENKINS_HOST/pluginManager/api/xml?depth=1&xpath=/*/*/shortName|/*/*/version&wrapper=plugins" | \
+#  perl -pe 's/.*?<shortName>([\w-]+).*?<version>([^<]+)()(<\/\w+>)+/\1 \2\n/g'|sed 's/ /:/ ' | awk -F: '{ print $1 }' | sort'
+# ----------------------------------------------------
 
+# from a derived Dockerfile, can use `RUN /usr/local/bin/install-plugins.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle
 
-# ----------------------------------------------------
 COPY plugins.sh /usr/local/bin/plugins.sh
 COPY install-plugins.sh /usr/local/bin/install-plugins.sh
-# Install additional plugins
-COPY plugins.txt /usr/share/jenkins/ref/
-RUN /usr/local/bin/plugins.sh /usr/share/jenkins/ref/plugins.txt
-
-USER root
+COPY active-plugins.txt /active-plugins.txt
 
-RUN apt-get clean
+RUN /usr/local/bin/plugins.sh active-plugins.txt
 
+#install-plugins.sh get in trouble with curl maybe better next time in Jenkins --->  RUN /usr/local/bin/install-plugins.sh $(cat active-plugins.txt)
 
+USER root
 
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 

jenkins-fat/Plugins/.gitkeep

@@ -0,0 +1,148 @@
+ace-editor
+analysis-collector
+analysis-core
+ansible
+ansicolor
+ant
+antisamy-markup-formatter
+apache-httpcomponents-client-4-api
+authentication-tokens
+bouncycastle-api
+branch-api
+buildgraph-view
+build-monitor-plugin
+build-name-setter
+build-timeout
+buildtriggerbadge
+build-view-column
+build-with-parameters
+checkstyle
+cloudbees-folder
+compact-columns
+conditional-buildstep
+config-file-provider
+console-badge
+console-column-plugin
+console-tail
+copyartifact
+credentials
+credentials-binding
+cvs
+delivery-pipeline-plugin
+dependencyanalyzer
+depgraph-view
+display-url-api
+docker-commons
+docker-java-api
+docker-plugin
+docker-workflow
+durable-task
+email-ext
+envfile
+envinject
+envinject-api
+extensible-choice-parameter
+external-monitor-job
+favorite
+file-operations
+findbugs
+git
+git-changelog
+git-client
+github
+github-api
+github-branch-source
+gitlab-hook
+gitlab-logo
+gitlab-merge-request-jenkins
+gitlab-oauth
+gitlab-plugin
+git-parameter
+git-server
+git-tag-message
+gradle
+greenballs
+handlebars
+htmlpublisher
+jackson2-api
+javadoc
+jdepend
+jira
+jobConfigHistory
+job-dsl
+jobtype-column
+jquery
+jquery-detached
+jquery-ui
+jsch
+junit
+lastfailureversioncolumn
+lastsuccessdescriptioncolumn
+lastsuccessversioncolumn
+ldap
+m2release
+m2-repo-reaper
+mailer
+mapdb-api
+matrix-auth
+matrix-project
+maven-artifact-choicelistprovider
+maven-plugin
+modernstatus
+momentjs
+nested-view
+nexus-artifact-uploader
+nexus-jenkins-plugin
+notification
+pam-auth
+parameterized-trigger
+pipeline-build-step
+pipeline-github-lib
+pipeline-graph-analysis
+pipeline-input-step
+pipeline-milestone-step
+pipeline-model-api
+pipeline-model-declarative-agent
+pipeline-model-definition
+pipeline-model-extensions
+pipeline-rest-api
+pipeline-stage-step
+pipeline-stage-tags-metadata
+pipeline-stage-view
+plain-credentials
+post-completed-build-result
+promoted-builds
+promoted-builds-simple
+pubsub-light
+repository-connector
+resource-disposer
+ruby-runtime
+run-condition
+saferestart
+scm-api
+script-security
+sonar
+sonar-quality-gates
+sse-gateway
+ssh-credentials
+ssh-slaves
+structs
+subversion
+timestamper
+token-macro
+variant
+violation-comments-to-github
+virtualbox
+windows-slaves
+workflow-aggregator
+workflow-api
+workflow-basic-steps
+workflow-cps
+workflow-cps-global-lib
+workflow-durable-task-step
+workflow-job
+workflow-multibranch
+workflow-scm-step
+workflow-step-api
+workflow-support
+ws-cleanup