diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2019-09-20 10:43:03 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2019-09-24 08:04:53 +0200 |
| commit | a8153577fec40c83193dddc69a0adc829dd57c7e (patch) | |
| tree | 9eee5cd2cbf547165719fc1ea4be2f40b58554f3 /docker/Dockerfile_osmocom_jenkins.amd64 | |
| parent | a5fb5484ae20c96ebf3bc1443149c62f834f5e09 (diff) | |
gerrit, master builds: use stretch, not jessie
Debian jessie (8) is EOL already, so switch to stretch (9). This is
required to build all Osmocom projects in docker, because at least
libosmocore fails to build with the old image (tests won't build with
GCC-4.9.x from jessie unless -Werror is disabled).
Do not build the jessie image anymore, and update the shared dockerfile.
Remove everything jessie specific, and make it work with stretch by
installing asciidoc-dblatex. Otherwise we get this error when building
manuals:
a2x: ERROR: missing configuration file: /etc/asciidoc/dblatex/asciidoc-dblatex.xsl
Add '--cap-add SYS_PTRACE' argument to the docker run command, because
otherwise the address sanitizer isn't working anymore with stretch
(which makes the OsmoPCU tests fail).
I've tried to split this patch up into multiple ones, but since there is
no asciidoc-dblatex package in jessie, we must add the dependency and
switch the image at the same time.
Related: OS#3726
Change-Id: I61fe93863d5367e3b9c01ab4726bb95bd16d891d
Diffstat (limited to 'docker/Dockerfile_osmocom_jenkins.amd64')
| -rw-r--r-- | docker/Dockerfile_osmocom_jenkins.amd64 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 3f499ad..897db15 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -1,10 +1,9 @@ -ARG DEBIAN_VERSION=jessie +ARG DEBIAN_VERSION=stretch FROM debian:${DEBIAN_VERSION} RUN \ - echo "deb http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \ dpkg --add-architecture i386 && \ - DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Check-Valid-Until=false update && \ + DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make @@ -29,7 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends fl RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev libusb-1.0-0-dev libtalloc-dev libgnutls28-dev # OsmocomBB -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev # building RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf @@ -38,7 +37,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends li RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip # for osmo-gsm-manuals -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils asciidoc-dblatex # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc |