osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/41892?usp=email )
Change subject: debian-trixie-build: install the osmocom:misc repo ...................................................................... debian-trixie-build: install the osmocom:misc repo Install the osmocom:misc repository, so we can use the latest bpftrace version in ttcn3-bts-test. Related: OS#6927 Change-Id: I58e91932b089a92f4f4c31814cd1fd7d202b04c0 --- M debian-trixie-build/Dockerfile M debian-trixie-obs-latest/Dockerfile 2 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/92/41892/1 diff --git a/debian-trixie-build/Dockerfile b/debian-trixie-build/Dockerfile index b046748..dcac78e 100644 --- a/debian-trixie-build/Dockerfile +++ b/debian-trixie-build/Dockerfile @@ -6,7 +6,8 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"; ARG OSMOCOM_REPO_PATH="packages/osmocom:" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG OSMOCOM_REPO_NIGHTLY="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG OSMOCOM_REPO_MISC="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/misc/Debian_13/" ARG UID ARG LLVM_VERSION="14.0.0" @@ -221,11 +222,17 @@ ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format=TEXT /tmp/osmo-gsm-manuals-commit RUN git -C /opt clone --depth=1 https://gerrit.osmocom.org/osmo-gsm-manuals +# Install the Osmocom OBS misc repository +ADD $OSMOCOM_REPO_MISC/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO_MISC ./" \ + > /etc/apt/sources.list.d/osmocom-misc.list + # Install packages from Osmocom OBS nightly repository # * osmo-trx: sdcc (OS#6748) -ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_NIGHTLY/Release /tmp/Release RUN set -x && \ - echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO_NIGHTLY ./" \ > /etc/apt/sources.list.d/osmocom-nightly.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/debian-trixie-obs-latest/Dockerfile b/debian-trixie-obs-latest/Dockerfile index 691f621..4603e29 100644 --- a/debian-trixie-obs-latest/Dockerfile +++ b/debian-trixie-obs-latest/Dockerfile @@ -5,7 +5,8 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"; ARG OSMOCOM_REPO_PATH="packages/osmocom:" -ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_13/" +ARG OSMOCOM_REPO_LATEST="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_13/" +ARG OSMOCOM_REPO_MISC="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/misc/Debian_13/" ARG UID # Copy from common dir @@ -23,7 +24,7 @@ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ rm -rf /usr/share/man/ -# Configure Osmocom latest repository, add telnet for debugging +# Configure Osmocom repositories, add telnet for debugging RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ @@ -31,8 +32,10 @@ telnet \ && \ apt-get clean && \ - echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-latest.list + echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO_LATEST ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list && \ + echo "deb [signed-by=/usr/share/keyrings/osmocom-misc.asc] $OSMOCOM_REPO_MISC ./" \ + > /etc/apt/sources.list.d/osmocom-misc.list # Invalidate cache once the repository is updated -ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_LATEST/Release /tmp/Release -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I58e91932b089a92f4f4c31814cd1fd7d202b04c0 Gerrit-Change-Number: 41892 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <[email protected]>
