aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2021-04-06 14:42:45 +0300
committerRiku Voipio <riku.voipio@linaro.org>2021-04-07 13:52:01 +0300
commit33b9d3f3dcc06bca780d39b0fd039d8fc297572f (patch)
tree70fe4547e685ea8683b8f717b36229ead7135eef
parent8bcf26c8245cd109d58225f6a174f12de185d0b0 (diff)
downloaddockerfiles-33b9d3f3dcc06bca780d39b0fd039d8fc297572f.tar.gz
jenkins: upgrade to latest
Transitions also to buster based slim images, and install both python2 and python3 packages to allow migration of jobs to python3 Change-Id: Idf2431e797f3472af66bd4efef5f40bfd3cbb879
-rw-r--r--jessie-amd64-jenkins-master/Dockerfile28
-rw-r--r--jessie-amd64-jenkins-master/plugins.txt16
2 files changed, 21 insertions, 23 deletions
diff --git a/jessie-amd64-jenkins-master/Dockerfile b/jessie-amd64-jenkins-master/Dockerfile
index ced547b..992e8ae 100644
--- a/jessie-amd64-jenkins-master/Dockerfile
+++ b/jessie-amd64-jenkins-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.263.3
+FROM jenkins/jenkins:2.277.1-lts-slim
ENV JENKINS_JAVA_PARAMETERS="-server -XX:+AlwaysPreTouch -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/jenkins/heapdump.log -verbose:gc -Xloggc:/var/log/jenkins/gc-%t.log -XX:NumberOfGCLogFiles=2 -XX:+UseGCLogFileRotation -XX:GCLogFileSize=100m -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ParallelRefProcEnabled -XX:+ExplicitGCInvokesConcurrent -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1 -XX:MaxMetaspaceExpansion=64M -Djenkins.model.Jenkins.logStartupPerformance=true"
ENV JAVA_OPTS="-Xms8g -Xmx8g $JENKINS_JAVA_PARAMETERS -Djava.awt.headless=true -Dhudson.slaves.WorkspaceList='_' -Dhudson.model.ParametersAction.keepUndefinedParameters=true -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -Dorg.eclipse.jetty.server.Request.maxFormContentSize=1000000"
@@ -7,39 +7,37 @@ ENV JENKINS_OPTS="--sessionTimeout=1440 --sessionEviction=86400"
# Install jenkins job builder
# Create plugins directory, symlinked on host machine
USER root
-RUN wget -q https://bootstrap.pypa.io/pip/3.5/get-pip.py -O /tmp/get-pip.py \
- && python /tmp/get-pip.py \
- && rm -f /tmp/get-pip.py \
- && pip install jenkins-job-builder==2.10.0 pyyaml==5.1 jinja2==2.10.1 python-jenkins==1.4.0 \
- && mkdir -p /var/jenkins_plugins \
+RUN mkdir -p /var/jenkins_plugins \
&& chown jenkins:jenkins /var/jenkins_plugins \
&& ln -s /var/jenkins_home /var/lib/jenkins \
&& mkdir -p /usr/share/groovy/lib \
- && wget -q https://storage.googleapis.com/git-repo-downloads/repo -O /usr/bin/repo \
- && chmod +x /usr/bin/repo \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ && apt-get -q update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends \
ansible \
build-essential \
debian-keyring \
devscripts \
dirmngr \
- dput \
jq \
moreutils \
python-future \
python-paramiko \
+ python-pip \
python-requests \
+ python-setuptools \
+ python-wheel \
+ python3-pip \
+ python3-paramiko \
+ python3-requests \
python3-setuptools \
python3-wheel \
sshpass \
virtualenv \
- && wget -q https://launchpad.net/ubuntu/+archive/primary/+files/dput_0.9.6.4ubuntu3_all.deb \
- && dpkg -i --force-all *.deb \
+ && pip3 install jenkins-job-builder==2.10.0 pyyaml==5.1 jinja2==2.10.1 python-jenkins==1.4.0 \
+ && pip install jenkins-job-builder==2.10.0 pyyaml==5.1 jinja2==2.10.1 python-jenkins==1.4.0 \
&& apt-get clean \
&& rm -rf \
- /var/lib/apt/lists/* \
- *.deb
+ /var/lib/apt/lists/*
USER jenkins
# Install jenkins plugins
diff --git a/jessie-amd64-jenkins-master/plugins.txt b/jessie-amd64-jenkins-master/plugins.txt
index 67ce452..363602c 100644
--- a/jessie-amd64-jenkins-master/plugins.txt
+++ b/jessie-amd64-jenkins-master/plugins.txt
@@ -1,34 +1,34 @@
amazon-ecs:1.37
build-name-setter:2.1.0
build-timeout:1.20
-blueocean:1.24.4
+blueocean:1.24.5
copyartifact:1.46
docker-plugin:1.2.2
docker-slaves:1.0.7
ec2:1.56
-email-ext:2.81
+email-ext:2.82
envinject:2.3.0
extended-read-permission:3.2
flexible-publish:0.16.1
-gerrit-trigger:2.32.0
-git:4.5.2
+gerrit-trigger:2.33.0
+git:4.7.1
github-oauth:0.33
groovy-postbuild:2.5
jdk-tool:1.4
jenkins-multijob-plugin:1.36
jobConfigHistory:2.26
leastload:3.0.0
-matrix-auth:2.6.5
+matrix-auth:2.6.6
monitoring:1.86.0
multiple-scms:0.6
parameterized-trigger:2.39
pipeline-utility-steps:2.6.1
postbuildscript:2.11.0
-rebuild:1.31
+rebuild:1.32
ssh-agent:1.20
ssh-slaves:1.31.5
-timestamper:1.11.8
+timestamper:1.12
throttle-concurrents:2.1
workflow-aggregator:2.6
-ws-cleanup:0.38
+ws-cleanup:0.39
yet-another-docker-plugin:0.2.0