@@ -7,7 +7,7 @@ ENV JAVA_VERSION=8 \
77
88# update dpkg repositories and install tools
99
10- RUN apt-get update
10+ RUN apt-get update
1111# ------------ Open JDK
1212RUN apt-get install -y openjdk-8-jdk
1313# ------------ Tools f Jenkins and apt-get to use SSL Repositorys
@@ -16,17 +16,17 @@ RUN apt-get install -y --no-install-recommends apt-utils git wget curl graphviz
1616 # -----------------------------------------------
1717# --------------- Ansible
1818# -----------------------------------------------
19- RUN apt-add-repository ppa:ansible/ansible 2>/dev/null
19+ RUN apt-add-repository ppa:ansible/ansible 2>/dev/null
2020RUN apt-get update && apt-get -y install ansible
21- # --------------------------------------------
21+ # --------------------------------------------
2222# ------------ Docker
23- # --------------------------------------------
23+ # --------------------------------------------
2424RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg > docker-public-key && apt-key add docker-public-key && rm docker-public-key
2525RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
2626RUN apt-get update && apt-get install -y docker-ce
27- # --------------------------------------------
27+ # --------------------------------------------
2828# ------------ Docker Compose
29- # --------------------------------------------
29+ # --------------------------------------------
3030RUN curl -o /usr/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.16.1/docker-compose-$(uname -s)-$(uname -m)" \
3131 && chmod +x /usr/bin/docker-compose
3232
@@ -37,14 +37,14 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
3737ENV JENKINS_OPTS="--webroot=/var/cache/jenkins/war --prefix=/jenkins"
3838ENV GIT_SSL_NO_VERIFY=1
3939# -----------------------------------------------
40- # install Oracle Java if you want ... and
40+ # install Oracle Java if you want ... and
4141# remove the line "RUN apt-get install -y openjdk-8-jdk"
42- # and uncomment the next lines above ... but openjdk is pretty good !
42+ # and uncomment the next lines above ... but openjdk is pretty good !
4343# -----------------------------------------------
4444# ------------ Download
4545# ## ENV filename jdk-8u131-linux-x64.tar.gz
4646# ## 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
47- # ## RUN wget --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" -O /tmp/$filename $downloadlink
47+ # ## RUN wget --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" -O /tmp/$filename $downloadlink
4848# ---- unpack java
4949# ## ENV UNPACK_DIR=jdk1.8.0_131/
5050# ## RUN mkdir -p /opt/ && tar -zxf /tmp/$filename -C /opt/ && ln -s /opt/${UNPACK_DIR} /opt/java
@@ -58,7 +58,7 @@ RUN wget --no-verbose -O /tmp/apache-maven-3.2.5.tar.gz http://archive.apache.or
5858RUN echo "b2d88f02bd3a08a9df1f0b0126ebd8dc /tmp/apache-maven-3.2.5.tar.gz" | md5sum -c
5959# install maven
6060RUN tar xzf /tmp/apache-maven-3.2.5.tar.gz -C /opt/ && ln -s /opt/apache-maven-3.2.5 /opt/maven
61- ENV MAVEN_HOME /opt/maven
61+ ENV MAVEN_HOME /opt/maven
6262ENV PATH $MAVEN_HOME/bin:$JAVA_HOME/bin:$PATH
6363
6464RUN apt-get update && apt-get install -y zip unzip && rm -rf /opt/java/src.zip && rm -rf /tmp/$filename && rm -f /tmp/apache-maven-3.2.5.tar.gz
@@ -73,24 +73,24 @@ ARG uid=1000
7373ARG gid=1000
7474# 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
7575RUN groupadd -g ${gid} ${group} && useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user}
76- # Jenkins home directory is a volume, so configuration and build history
76+ # Jenkins home directory is a volume, so configuration and build history
7777# can be persisted and survive image upgrades
7878
79- VOLUME /var/jenkins_home
79+ VOLUME /var/jenkins_home
8080
81- # `/usr/share/jenkins/ref/` contains all reference configuration we want
82- # to set on a fresh new installation. Use it to bundle additional plugins
81+ # `/usr/share/jenkins/ref/` contains all reference configuration we want
82+ # to set on a fresh new installation. Use it to bundle additional plugins
8383# or config file with your custom jenkins Docker image.
8484RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d && mkdir /tmp
8585ENV TINI_VERSION 0.14.0
8686ENV TINI_SHA 6c41ec7d33e857d4779f14d9c74924cab0c7973485d2972419a3b7c7620ff5fd
87- # Use tini as subreaper in Docker container to adopt zombie processes
87+ # Use tini as subreaper in Docker container to adopt zombie processes
8888RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \
8989 && echo "$TINI_SHA /bin/tini" | sha256sum -c -
9090
9191COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy
9292
93- # jenkins version being bundled in this docker image
93+ # jenkins version being bundled in this docker image
9494# This is the latest stable version
9595ARG JENKINS_VERSION
9696ENV JENKINS_VERSION ${JENKINS_VERSION:-2.89.2}
@@ -100,18 +100,18 @@ ARG JENKINS_SHA=cf7be0af90e310a3232bcf1d6c80902788d5ebae
100100
101101ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
102102
103- # could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
103+ # could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
104104# see https://github.com/docker/docker/issues/8331
105- # RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war && echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha1sum -c -
105+ RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war && echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha1sum -c -
106106
107107# ------------------ Optional lokal caching of files
108- # Download jenkins with yout favorite browser and put the war in the current dir.
109- COPY jenkins-war-2.89.2.war /usr/share/jenkins/jenkins.war
108+ # Download jenkins with yout favorite browser and put the war in the current dir.
109+ # COPY jenkins-war-2.89.2.war /usr/share/jenkins/jenkins.war
110110# ##### # Copy all Cached plugins ...
111111# to preLoad all Plugins listed in active-plugins.txt use the command
112112# ./preDownload.sh $(cat active-plugins.txt)
113113# this will download all the plugins in th Folder Plugins
114- COPY Plugins/* /usr/share/jenkins/ref/plugins/
114+ # COPY Plugins/* /usr/share/jenkins/ref/plugins/
115115# ------------------ Optional lokal caching of files end block
116116
117117ENV JENKINS_UC https://updates.jenkins.io
@@ -152,4 +152,3 @@ RUN /usr/local/bin/plugins.sh active-plugins.txt
152152USER root
153153
154154RUN apt-get clean && rm -rf /var/lib/apt/lists/*
155-
0 commit comments