From af19167c265fa2b2a74f1cf2291eabae1882c199 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben@geanix.com>
Date: Tue, 28 Feb 2023 11:37:16 +0100
Subject: [PATCH] containers: Update ca-certificates package pinning
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
.oniro-ci/containers/bitbake-builder/Dockerfile | 2 +-
.oniro-ci/containers/dco-check/Dockerfile | 2 +-
.oniro-ci/containers/docs-builder/Dockerfile | 2 +-
.oniro-ci/containers/reuse/Dockerfile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.oniro-ci/containers/bitbake-builder/Dockerfile b/.oniro-ci/containers/bitbake-builder/Dockerfile
index 172726d8..35f86e3c 100644
--- a/.oniro-ci/containers/bitbake-builder/Dockerfile
+++ b/.oniro-ci/containers/bitbake-builder/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update -qq \
gawk git sudo wget language-pack-en-base time locales python-is-python3 \
python3-distutils python3-pip libssl-dev iproute2 iputils-ping curl jq \
lz4 zstd iptables\
- && eatmydata apt-get install -qq -y 'ca-certificates=20211016~20.04.1' \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20211016ubuntu0.20.04.1' \
&& eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
RUN locale-gen
RUN pip3 install anybadge
diff --git a/.oniro-ci/containers/dco-check/Dockerfile b/.oniro-ci/containers/dco-check/Dockerfile
index 449a167a..31417aab 100644
--- a/.oniro-ci/containers/dco-check/Dockerfile
+++ b/.oniro-ci/containers/dco-check/Dockerfile
@@ -23,5 +23,5 @@ ARG DEBIAN_FRONTEND="noninteractive"
RUN apt-get update -qq \
&& apt-get install -y eatmydata \
&& eatmydata apt-get install -qq -y 'dco-check=0.1.1-1+ostc2' \
- && eatmydata apt-get install -qq -y 'ca-certificates=20210119~20.04.2' \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20211016ubuntu0.20.04.1' \
&& eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/.oniro-ci/containers/docs-builder/Dockerfile b/.oniro-ci/containers/docs-builder/Dockerfile
index 19246a0e..7e5dac19 100644
--- a/.oniro-ci/containers/docs-builder/Dockerfile
+++ b/.oniro-ci/containers/docs-builder/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update -qq \
git-repo git git-lfs \
python3-pip python3-sphinx python3-sphinx-rtd-theme python3-recommonmark \
python3-sphinxcontrib.plantuml \
- && eatmydata apt-get install -qq -y 'ca-certificates=20211016~20.04.1' \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20211016ubuntu0.20.04.1' \
&& eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
# We need to fix the version here to avoid pulling docutils 0.18 which is
diff --git a/.oniro-ci/containers/reuse/Dockerfile b/.oniro-ci/containers/reuse/Dockerfile
index cc7ad83d..8703a580 100644
--- a/.oniro-ci/containers/reuse/Dockerfile
+++ b/.oniro-ci/containers/reuse/Dockerfile
@@ -23,5 +23,5 @@ ARG DEBIAN_FRONTEND="noninteractive"
RUN apt-get update -qq \
&& apt-get install -y eatmydata \
&& eatmydata apt-get install -qq -y reuse=0.13.0-1 'spread=0~20201124-1+ohos3' \
- && eatmydata apt-get install -qq -y 'ca-certificates=20210119~20.04.2' \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20211016ubuntu0.20.04.1' \
&& eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
--
GitLab