.oniro-ci/containers/bitbake-builder/.gitconfig

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [user]
-	name = Oniro Project CI
-	email = oniro-dev@eclipse.org
+	name = Oniro Core Project Bot
+	email = oniro-core-bot@eclipse.org

.oniro-ci/containers/docs-builder/.gitconfig

 # SPDX-FileCopyrightText: 2021 Huawei Inc.
+#
 # SPDX-License-Identifier: Apache-2.0
 
 [user]
-	name = Oniro Project CI
-	email = oniro-dev@eclipse.org
+	name = Oniro Core Project Bot
+	email = oniro-core-bot@eclipse.org

.oniro-ci/containers/docs-builder/Dockerfile

 # 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"
@@ -11,7 +11,12 @@ RUN apt-get update -qq \
  && apt-get install -y eatmydata \
  && eatmydata apt-get install -qq -y \
       git-repo git git-lfs \
-      python3-sphinx python3-sphinx-rtd-theme python3-recommonmark python3-sphinx-tabs \
+      python3-pip python3-sphinx python3-sphinx-rtd-theme python3-recommonmark \
       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/*
+
+# We need to fix the version here to avoid pulling docutils 0.18 which is
+# incompatible with the sphinx version from Ubuntu focal. See more here:
+# https://github.com/sphinx-doc/sphinx/issues/9841
+RUN pip3 install sphinx-tabs==3.4.0

.oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-impish.list → .oniro-ci/containers/docs-builder/ppa/zyga-ubuntu-oh-tools-focal.list

 # 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
+deb http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main
+# deb-src http://ppa.launchpad.net/zyga/oh-tools/ubuntu/ focal main