osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28416 )
Change subject: Install ca-certificates before Osmocom repo ......................................................................
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 --- M debian-bullseye-build/Dockerfile M debian-bullseye-erlang/Dockerfile M debian-bullseye-obs-latest/Dockerfile M debian-bullseye-titan/Dockerfile M debian-buster-build/Dockerfile M debian-buster-jenkins/Dockerfile M debian-jessie-osmocom/Dockerfile M debian-sid-jenkins/Dockerfile M debian-stretch-build/Dockerfile M debian-stretch-jenkins/Dockerfile M debian-stretch-obs-latest/Dockerfile M osmo-ran/Dockerfile M osmo-ran/split/ran-bsc_mgw/Dockerfile M osmo-ran/split/ran-bts_pcu/Dockerfile M osmo-ran/split/ran-trx-ipc/Dockerfile M osmo-ran/split/ran-trx-uhd/Dockerfile 16 files changed, 18 insertions(+), 0 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved
diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile index baeba30..3c8bf4b 100644 --- a/debian-bullseye-build/Dockerfile +++ b/debian-bullseye-build/Dockerfile @@ -15,6 +15,7 @@ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-bullseye-erlang/Dockerfile b/debian-bullseye-erlang/Dockerfile index aeff1c7..9c3d4f3 100644 --- a/debian-bullseye-erlang/Dockerfile +++ b/debian-bullseye-erlang/Dockerfile @@ -44,6 +44,7 @@
# 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 fb8cd93..6707838 100644 --- a/debian-bullseye-obs-latest/Dockerfile +++ b/debian-bullseye-obs-latest/Dockerfile @@ -10,6 +10,7 @@ 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 125f02b..576041c 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -8,6 +8,7 @@ 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 b80d881..7000ca5 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -15,6 +15,7 @@ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index 6bbd389..04c6c4c 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -26,6 +26,7 @@ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile index 08fb320..011f5aa 100644 --- a/debian-jessie-osmocom/Dockerfile +++ b/debian-jessie-osmocom/Dockerfile @@ -9,6 +9,9 @@
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 411b640..944e514 100644 --- a/debian-sid-jenkins/Dockerfile +++ b/debian-sid-jenkins/Dockerfile @@ -26,6 +26,7 @@ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile index b04eb8e..b144e13 100644 --- a/debian-stretch-build/Dockerfile +++ b/debian-stretch-build/Dockerfile @@ -15,6 +15,7 @@ automake \ bison \ build-essential \ + ca-certificates \ cppcheck \ dahdi-source \ debhelper \ diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile index b5c36fb..d44e394 100644 --- a/debian-stretch-jenkins/Dockerfile +++ b/debian-stretch-jenkins/Dockerfile @@ -26,6 +26,7 @@ bc \ bison \ bzip2 \ + ca-certificates \ cmake \ coccinelle \ cppcheck \ diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile index aaf1b43..fe3420b 100644 --- a/debian-stretch-obs-latest/Dockerfile +++ b/debian-stretch-obs-latest/Dockerfile @@ -9,6 +9,7 @@ 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 64697c6..07c8551 100644 --- a/osmo-ran/Dockerfile +++ b/osmo-ran/Dockerfile @@ -16,6 +16,7 @@ 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 e0e3b15..03c16fe 100644 --- a/osmo-ran/split/ran-bsc_mgw/Dockerfile +++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile @@ -16,6 +16,7 @@ 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 d8b9bcd..0129b75 100644 --- a/osmo-ran/split/ran-bts_pcu/Dockerfile +++ b/osmo-ran/split/ran-bts_pcu/Dockerfile @@ -16,6 +16,7 @@ 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 e273da9..467adab 100644 --- a/osmo-ran/split/ran-trx-ipc/Dockerfile +++ b/osmo-ran/split/ran-trx-ipc/Dockerfile @@ -16,6 +16,7 @@ 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 adc764a..3603685 100644 --- a/osmo-ran/split/ran-trx-uhd/Dockerfile +++ b/osmo-ran/split/ran-trx-uhd/Dockerfile @@ -16,6 +16,7 @@ debian*) \ apt-get update && \ apt-get install -y --no-install-recommends \ + ca-certificates \ gnupg && \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \
-
osmith