Skip to content

Commit 02d1605

Browse files
author
klutz
committed
Updated to Jenkins 2.122
Also configuring choice of Python3 venv and legacy virtualenv. Plugin versions updated into line with new Jenkins.
1 parent 7a514e6 commit 02d1605

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# image will be extended further for specific use cases - especially
1111
# for embedded C++.
1212

13-
FROM jenkins/jenkins:2.110
13+
FROM jenkins/jenkins:2.122
1414
MAINTAINER Mike Ritchie <mike@13coders.com>
1515
LABEL description="Docker base image for C++17 CI builds"
1616

@@ -37,8 +37,8 @@ USER root
3737

3838
RUN apt-get update
3939
RUN apt-get install -y build-essential gcc-6 gdb git valgrind \
40-
python3-pip linux-perf google-perftools python-dev zlib1g-dev \
41-
lcov
40+
python3-pip python3-venv python-dev linux-perf google-perftools \
41+
zlib1g-dev lcov
4242

4343
# Install and configure AWS command line tools for fetching binaries
4444
# from a private S3 bucket, using arguments passed from Docker build
@@ -51,6 +51,11 @@ RUN pip3 install awscli
5151

5252
RUN pip3 install robotframework
5353

54+
# Install virtualenv systemwide to allow in-CI creation of Python
55+
# environments, as a legacy compatibility alternative to Python 3 venv
56+
57+
RUN pip3 install virtualenv
58+
5459
# Install Conan package management system with pip.
5560

5661
RUN pip3 install conan

plugins.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
blueocean:1.4.2
2-
git:3.8.0
1+
blueocean:1.5.0
2+
git:3.9.0

0 commit comments

Comments
 (0)