From 96a3d2c0c08503d693bba5178702cbed9c50d458 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Mon, 25 Jul 2022 12:47:25 +0200
Subject: [PATCH] ci: Downgrade docs docker image Ubuntu version to focal
The currently used version, impish, is not updatable anymore since July
the 14th and we don't have a newer version in our repository. Downgrade
this to focal to fix the container image builds.
Fixes: https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/724
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
.oniro-ci/containers/docs-builder/Dockerfile | 6 +++---
.../docs-builder/ppa/zyga-ubuntu-oh-tools-focal.list | 4 ++++
.../docs-builder/ppa/zyga-ubuntu-oh-tools-impish.list | 4 ----
3 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 .oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-focal.list
delete mode 100644 .oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-impish.list
diff --git a/.oniro-ci/containers/docs-builder/Dockerfile b/.oniro-ci/containers/docs-builder/Dockerfile
index df6b43b8..006fd3d7 100644
--- a/.oniro-ci/containers/docs-builder/Dockerfile
+++ b/.oniro-ci/containers/docs-builder/Dockerfile
@@ -1,9 +1,9 @@
# SPDX-FileCopyrightText: Huawei Inc.
# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:21.10
+FROM ubuntu:20.04
-COPY --chown=root:root ppa/zyga-ubuntu-oh-tools-impish.list /etc/apt/sources.list.d/
+COPY --chown=root:root ppa/zyga-ubuntu-oh-tools-focal.list /etc/apt/sources.list.d/
COPY --chown=root:root ppa/zyga-ubuntu-oh-tools.gpg /etc/apt/trusted.gpg.d/
ARG DEBIAN_FRONTEND="noninteractive"
@@ -13,5 +13,5 @@ RUN apt-get update -qq \
git-repo git git-lfs \
python3-sphinx python3-sphinx-rtd-theme python3-recommonmark python3-sphinx-tabs \
python3-sphinxcontrib.plantuml \
- && eatmydata apt-get install -qq -y 'ca-certificates=20210119ubuntu1' \
+ && eatmydata apt-get install -qq -y 'ca-certificates=20211016~20.04.1' \
&& eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-focal.list b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-focal.list
new file mode 100644
index 00000000..729b1c91
--- /dev/null
+++ b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-focal.list
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-FileCopyrightText: 2020 Huawei Inc.
+deb http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
+# deb-src http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
diff --git a/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-impish.list b/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-impish.list
deleted file mode 100644
index 4d86cf37..00000000
--- a/.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-impish.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: 2020 Huawei Inc.
-deb http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ impish main
-# deb-src http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ impish main
--
GitLab