From f3c09b2a24182673ca90f791802ac46a90e98f8d Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 27 Jun 2022 16:28:11 +0200 Subject: [PATCH] Install ca-certificates before Osmocom repo Prepare for using https://downloads.osmocom.org/packages/ instead of http://download.opensuse.org to download packages. Install ca-certificates before attempting to use the repository, otherwise it will print a warning and not use the repository and e.g. install eclipse-titan from debian's repository instead of our repo. Fix for: W: https://downloads.osmocom.org/packages/osmocom:/latest/Debian_11/./InRelease: No system certificates available. Try installing ca-certificates. Related: OS#5557 Change-Id: Icb6764601671b6e66591f33ede6d0f822811545a --- debian-bullseye-build/Dockerfile | 1 + debian-bullseye-erlang/Dockerfile | 1 + debian-bullseye-obs-latest/Dockerfile | 1 + debian-bullseye-titan/Dockerfile | 1 + debian-buster-build/Dockerfile | 1 + debian-buster-jenkins/Dockerfile | 1 + debian-jessie-osmocom/Dockerfile | 3 +++ debian-sid-jenkins/Dockerfile | 1 + debian-stretch-build/Dockerfile | 1 + debian-stretch-jenkins/Dockerfile | 1 + debian-stretch-obs-latest/Dockerfile | 1 + osmo-ran/Dockerfile | 1 + osmo-ran/split/ran-bsc_mgw/Dockerfile | 1 + osmo-ran/split/ran-bts_pcu/Dockerfile | 1 + osmo-ran/split/ran-trx-ipc/Dockerfile | 1 + osmo-ran/split/ran-trx-uhd/Dockerfile | 1 + 16 files changed, 18 insertions(+) diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile index baeba301..3c8bf4bb 100644 --- a/debian-bullseye-build/Dockerfile +++ b/debian-bullseye-build/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get update && \ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile index aeff1c72..9c3d4f34 100644 --- a/debian-bullseye-erlang/Dockerfile +++ b/debian-bullseye-erlang/Dockerfile @@ -44,6 +44,7 @@ RUN apt-get update && \ # add osmocom latest repo, should we ever require packages from there RUN apt-get update && apt-get install -y \ + ca-certificates \ gnupg COPY .common/Release.key /tmp/Release.key RUN apt-key add /tmp/Release.key && \ diff --git a/debian-bullseye-obs-latest/Dockerfile b/debian-bullseye-obs-latest/Dockerfile index fb8cd934..6707838a 100644 --- a/debian-bullseye-obs-latest/Dockerfile +++ b/debian-bullseye-obs-latest/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ telnet \ + ca-certificates \ gnupg \ && \ apt-get clean diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 125f02bd..576041cb 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -8,6 +8,7 @@ ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_11/" RUN apt-get update && apt-get install -y \ + ca-certificates \ gnupg COPY .common/Release.key /tmp/Release.key diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index b80d8810..7000ca5f 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get update && \ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 6bbd389b..04c6c4ca 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -26,6 +26,7 @@ RUN \ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile index 08fb3204..011f5aa7 100644 --- a/debian-jessie-osmocom/Dockerfile +++ b/debian-jessie-osmocom/Dockerfile @@ -9,6 +9,9 @@ ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_8.0 COPY .common/Release.key /tmp/Release.key +RUN apt-get update && apt-get install -y \ + ca-certificates + RUN apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list diff --git a/debian-sid-jenkins/Dockerfile b/debian-sid-jenkins/Dockerfile index 411b640d..944e5140 100644 --- a/debian-sid-jenkins/Dockerfile +++ b/debian-sid-jenkins/Dockerfile @@ -26,6 +26,7 @@ RUN \ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index b04eb8ed..b144e130 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get update && \ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index b5c36fb9..d44e3941 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -26,6 +26,7 @@ RUN \ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile index aaf1b43b..fe3420be 100644 --- a/debian-stretch-obs-latest/Dockerfile +++ b/debian-stretch-obs-latest/Dockerfile @@ -9,6 +9,7 @@ ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_9.0/ RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ + ca-certificates \ telnet \ gnupg \ && \ diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile index 64697c68..07c8551a 100644 --- a/osmo-ran/Dockerfile +++ b/osmo-ran/Dockerfile @@ -16,6 +16,7 @@ RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile index e0e3b150..03c16fe8 100644 --- a/osmo-ran/split/ran-bsc_mgw/Dockerfile +++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile @@ -16,6 +16,7 @@ RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile index d8b9bcdb..0129b756 100644 --- a/osmo-ran/split/ran-bts_pcu/Dockerfile +++ b/osmo-ran/split/ran-bts_pcu/Dockerfile @@ -16,6 +16,7 @@ RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile index e273da93..467adab0 100644 --- a/osmo-ran/split/ran-trx-ipc/Dockerfile +++ b/osmo-ran/split/ran-trx-ipc/Dockerfile @@ -16,6 +16,7 @@ RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile index adc764a1..3603685c 100644 --- a/osmo-ran/split/ran-trx-uhd/Dockerfile +++ b/osmo-ran/split/ran-trx-uhd/Dockerfile @@ -16,6 +16,7 @@ RUN case "$DISTRO" in \ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \