diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-03-10 12:06:25 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-03-10 13:25:51 +0100 |
| commit | d5d20c7a9a817541ff8812364009a36d7db288bd (patch) | |
| tree | 0afa5fc73e5a61dc3be8f064f25e39a37c3481bd | |
| parent | 9a526e876f6a939f8bf6531b40876d1642a1e997 (diff) | |
debian-stretch-build-dist: use -obs-latest
Change debian-stretch-build-dist to be based on
debian-stretch-obs-latest instead of debian-stretch-build. The latter
installs the nightly OBS repository now (as that is what we need for the
TTCN-3 builds using debian-stretch-build), but debian-stretch-build-dist
needs to install packages from OBS latest.
Fixes jenkins failures:
The following packages have unmet dependencies:
libasn1c-dev : Depends: osmocom-latest but it is not going to be installed
...
Related: OS#5049
Change-Id: I2cf6ed732e55b8f0e63bd8fc040749bd16676d0f
| -rw-r--r-- | debian-stretch-build-dist/Dockerfile | 55 |
1 files changed, 37 insertions, 18 deletions
diff --git a/debian-stretch-build-dist/Dockerfile b/debian-stretch-build-dist/Dockerfile index 5e12a81..359c687 100644 --- a/debian-stretch-build-dist/Dockerfile +++ b/debian-stretch-build-dist/Dockerfile @@ -1,40 +1,59 @@ ARG USER -FROM $USER/debian-stretch-build +FROM $USER/debian-stretch-obs-latest # Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/" - -COPY Release.key /tmp/Release.key - -RUN apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list - -ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ + autoconf \ + autoconf-archive \ + autogen \ + automake \ + bison \ + build-essential \ ca-certificates \ - libboost-all-dev \ - liboping-dev \ - libuhd-dev \ - \ + dahdi-source \ + git \ libasn1c-dev \ + libboost-all-dev \ + libc-ares-dev \ + libdbd-sqlite3 \ + libdbi-dev \ + libfftw3-dev \ + libgnutls28-dev \ + libgps-dev \ + libgsm1-dev \ libgtp-dev \ libgtpnl-dev \ liblimesuite-dev \ + libncurses5-dev \ + liboping-dev \ liborcania-dev \ + libortp-dev \ libosmo-abis-dev \ - libosmocore-dev \ - libosmodsp-dev \ libosmo-gsup-client-dev \ libosmo-mgcp-client-dev \ libosmo-netif-dev \ libosmo-ranap-dev \ libosmo-sccp-dev \ libosmo-sigtran-dev \ + libosmocore-dev \ + libosmodsp-dev \ + libpcap-dev \ + libpcsclite-dev \ + libreadline-dev \ + libsctp-dev \ libsmpp34-dev \ + libsofia-sip-ua-glib-dev \ + libsqlite3-dev \ + libssl-dev \ + libtalloc-dev \ + libtool \ + libuhd-dev \ libulfius-dev \ + libusb-1.0-0-dev \ + libusb-dev \ libusrp-dev \ - libyder-dev && \ + libyder-dev \ + make \ + && \ apt-get clean |