Cleanup Jenkins

Author: Springjunky

jenkins-fat/.gitignore

@@ -1 +1,2 @@
 /active-plugins.txt_SAVE
+Plugins

jenkins-fat/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:19.04
 ENV DEBIAN_FRONTEND noninteractive
 ENV JAVA_VERSION=8 \
     JAVA_UPDATE=131 \
@@ -22,10 +22,11 @@ RUN  apt-get update  &&  apt-get -y install ansible
 #--------------------------------------------
 #------------ Docker
 #--------------------------------------------
+RUN echo 
 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) edge" && \
+RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) edge test" && \
      apt-get update && apt-get install -y docker-ce
 #--------------------------------------------
 #------------ Docker Compose
@@ -40,26 +41,14 @@ RUN curl -o /usr/bin/docker-compose -L \
 
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 
-# This is the line for the Jenkins prefix to set ... remember
+# This is the line for the Jenkins prefix to set to get access with nginx and a 
+# comfortable path like http://<yourhost>/jenins... remember
 # to set the location in the  reverse-proxy.conf if you change this
 
 ENV JENKINS_OPTS="--webroot=/var/cache/jenkins/war --prefix=/jenkins"
 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 !
-#-----------------------------------------------
-#------------ Download
-# ## ENV filename jdk-8u131-linux-x64.tar.gz
-# ## ENV downloadlink http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION}u${JAVA_UPDATE}-b${JAVA_BUILD}/d54c1d3a095b4ff2b6607d096fa80163/jdk-${JAVA_VERSION}u${JAVA_UPDATE}-linux-x64.tar.gz
-# ## RUN   wget --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" -O /tmp/$filename $downloadlink
-# ----  unpack java
-# ## ENV UNPACK_DIR=jdk1.8.0_131/
-# ## RUN mkdir -p /opt/  && tar -zxf /tmp/$filename -C /opt/ && ln -s /opt/${UNPACK_DIR} /opt/java
-# ## ENV JAVA_HOME /opt/java
 #----------------------------------------
-#  install Maven
+#  Maven
 #----------------------------------------
 RUN wget --no-verbose -O /tmp/apache-maven-3.5.3.tar.gz \
           http://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.tar.gz
@@ -89,61 +78,43 @@ RUN groupadd -g ${gid} ${group} && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid
 # Jenkins home directory is a volume, so configuration and build history
 # can be persisted and survive image upgrades
 
+RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d && mkdir /tmp
+
 VOLUME /var/jenkins_home
 
-# `/usr/share/jenkins/ref/` contains all reference configuration we want
-# to set on a fresh new installation. Use it to bundle additional plugins
-# or config file with your custom jenkins Docker image.
-RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d && mkdir /tmp
 ENV TINI_VERSION 0.18.0
 ENV TINI_SHA eadb9d6e2dc960655481d78a92d2c8bc021861045987ccd3e27c7eae5af0cf33
 # Use tini as subreaper in Docker container to adopt zombie processes
 RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \
   && echo "$TINI_SHA  /bin/tini" | sha256sum -c -
 
-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.125}
+# This is the latest stable version define in file ../.env
+ARG JENKINS_LTS_VERSION
+RUN echo JENKINS_LTS_VERSION=${JENKINS_LTS_VERSION}
 
 #### jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=80d9a44198195f70218867086759c108821ca0ce
-ARG JENKINS_URL=http://updates.jenkins-ci.org/download/war/${JENKINS_VERSION}/jenkins.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 -
-
-RUN wget --no-verbose ${JENKINS_URL} -O /usr/share/jenkins/jenkins.war  && \
-    echo "422ba2120ade4c39e19c1aa63684c5db /usr/share/jenkins/jenkins.war" | md5sum -c
+ARG JENKINS_SHA=1ab9577a29362ae9cb51742d9778b44a5c820a9e
+ARG JENKINS_URL=http://updates.jenkins-ci.org/download/war/${JENKINS_LTS_VERSION}/jenkins.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 echo Download from ${JENKINS_URL} && \
+    curl -fL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war && \
+    echo "${JENKINS_SHA}  /usr/share/jenkins/jenkins.war" | sha1sum -c -
 
-#------------------ Optional local caching of files
-# Download jenkins with yout favorite browser and put the war in the current dir.
-# COPY jenkins-war-${JENKINS_VERSION:-2.99}.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
+COPY Plugins/${JENKINS_LTS_VERSION}/* /usr/share/jenkins/ref/plugins/
 
 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, reversed-proxied by nginx
 EXPOSE 8080
-
 ENV COPY_REFERENCE_FILE_LOG $JENKINS_HOME/copy_reference_file.log
-
 USER ${user}
-
 COPY jenkins-support /usr/local/bin/jenkins-support
 COPY jenkins.sh /usr/local/bin/jenkins.sh
-
-ENV JAVA_OPTIONS="-Djava.awt.headless=true -Dhudson.security.csrf.requestfield=crumb"
+ENV JAVA_OPTIONS="-Djava.awt.headless=true -Dhudson.security.csrf.requestfield=crumb -Djenkins.install.runSetupWizard=false"
 
 ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
 #-------------------------------------------------------------------------
@@ -154,16 +125,9 @@ ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
 # 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
-COPY active-plugins.txt /active-plugins.txt
-
-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)
+# Prevent Setup Wizard .. all Plugins copied before
+RUN echo ${JENKINS_LTS_VERSION}  > /usr/share/jenkins/ref/jenkins.install.UpgradeWizard.state
+RUN echo ${JENKINS_LTS_VERSION} > /usr/share/jenkins/ref/jenkins.install.InstallUtil.lastExecVersion
 
 USER root
 

jenkins-fat/Plugins/.gitkeep

@@ -1,2 +1,2 @@
-
-docker build --tag jenkins-fat --file Dockerfile .
+. ../.env
+docker build --build-arg JENKINS_LTS_VERSION=$JENKINS_LTS --tag jenkins-fat --file Dockerfile .

jenkins-fat/active-plugins.txt

@@ -1,9 +1,22 @@
-master:
-  build: .
-  environment:
-    JAVA_OPTS: "-Djava.awt.headless=true"
-  ports:
-    - "50000:50000"
-    - "8080:8080"
-  volumes:
-    - /var/jenkins_home
+version: "3"
+
+networks:
+  devstacknetwork:
+    driver: bridge
+
+services:
+  jenkins:
+    ports:
+       - 8080:8080      # http://
+    build: 
+      context: .
+      args:
+        JENKINS_LTS_VERSION: 2.176
+    container_name: jenkins-fat
+    networks:
+      - devstacknetwork
+    volumes:
+      - /home/tom/devstack-data/jenkins:/var/jenkins_home
+      - /var/run/docker.sock:/var/run/docker.sock
+
+      

jenkins-fat/buildDockerImages.sh

@@ -1,5 +1,5 @@
-analysis-collector
 ace-editor
+analysis-collector
 analysis-core
 ansible
 ansicolor
@@ -21,12 +21,14 @@ cloudbees-folder
 compact-columns
 conditional-buildstep
 config-file-provider
+configuration-as-code
 console-badge
 console-column-plugin
 console-tail
 copyartifact
 credentials
 credentials-binding
+cucumber-reports
 cvs
 delivery-pipeline-plugin
 dependencyanalyzer
@@ -79,6 +81,7 @@ junit
 lastfailureversioncolumn
 lastsuccessversioncolumn
 ldap
+lockable-resources
 m2release
 mailer
 mapdb-api
@@ -130,8 +133,6 @@ timestamper
 token-macro
 variant
 violation-comments-to-github
-virtualbox
-windows-slaves
 workflow-aggregator
 workflow-api
 workflow-basic-steps