osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28101 )
Change subject: osmocom-bb-host-master: modernize ...................................................................... osmocom-bb-host-master: modernize Do not set up the Osmocom repository inside osmocom-bb-host-master, it is done in debian-bullseye-build. Without this patch, we actually installed the debian 9 version of libosmocore-dev in the debian 11 container. This is part 1/2 of fixing TTCN3-centos-bts-test, which has been failing since OSMOCOM_REPO_MIRROR was changed in osmo-ci.git. Part 2 is in osmo-ci I8201f34a0f9747eea78c358a626cc3981d7407c4. Change-Id: I78e0445a1b82e5cd72ecaa86e8fe25516b19f485 --- M osmocom-bb-host-master/Dockerfile 1 file changed, 0 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 3f9c108..21c7f31 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -1,24 +1,10 @@ ARG USER ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"; FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"; - -MAINTAINER Harald Welte <[email protected]> - ARG OSMO_BB_BRANCH="master" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" - -COPY .common/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-nightly.list - -ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ libosmocore-dev && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I78e0445a1b82e5cd72ecaa86e8fe25516b19f485 Gerrit-Change-Number: 28101 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <[email protected]> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <[email protected]> Gerrit-Reviewer: osmith <[email protected]> Gerrit-Reviewer: pespin <[email protected]> Gerrit-MessageType: merged
