diff --git a/.oniro-ci/containers/docs-builder/Dockerfile b/.oniro-ci/containers/docs-builder/Dockerfile index df6b43b8f4826d40fc1c6c028908bbd2cfa24394..006fd3d764f3283550bfc01682cf734cb0c00c0d 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 0000000000000000000000000000000000000000..729b1c91794444b3e94ceab467f20b74e3d4ef74 --- /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 4d86cf3791318e246925a84237e894da46fc81f6..0000000000000000000000000000000000000000 --- 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