You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/04/09 07:22:47 UTC

[arrow] branch master updated: ARROW-15873: [CI] Migrate from Ubuntu 21.04 to 22.04

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new e453ffeff2 ARROW-15873: [CI] Migrate from Ubuntu 21.04 to 22.04
e453ffeff2 is described below

commit e453ffeff233c358ec934a53a33b8b4b1d4e299b
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Sat Apr 9 16:22:36 2022 +0900

    ARROW-15873: [CI] Migrate from Ubuntu 21.04 to 22.04
    
    Ubuntu 21.04 reached EOL at 2022-01.
    
    Ubuntu 22.04 will be released in 2022-04.
    
    Closes #12781 from kou/ci-ubuntu-22.04
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 .dockerignore                                      |   1 +
 .env                                               |   3 +-
 ci/docker/ubuntu-18.04-verify-rc.dockerfile        |  40 +-------
 ci/docker/ubuntu-20.04-verify-rc.dockerfile        |  26 +----
 ...kerfile => ubuntu-22.04-cpp-minimal.dockerfile} | 113 ++++-----------------
 ...-cpp.dockerfile => ubuntu-22.04-cpp.dockerfile} |  61 ++++++-----
 .../docker/ubuntu-22.04-verify-rc.dockerfile       |  31 ++----
 dev/release/setup-ubuntu.sh                        |  54 ++++++++--
 dev/tasks/tasks.yml                                |  11 +-
 docker-compose.yml                                 |  10 +-
 10 files changed, 129 insertions(+), 221 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 554cb34f1e..e062e582ff 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -28,6 +28,7 @@
 !ci/**
 !c_glib/Gemfile
 !dev/archery/setup.py
+!dev/release/setup-*.sh
 !docs/requirements*.txt
 !python/requirements*.txt
 !python/manylinux1/**
diff --git a/.env b/.env
index 6f0fa2808b..a972654497 100644
--- a/.env
+++ b/.env
@@ -61,7 +61,8 @@ GO=1.16
 HDFS=3.2.1
 JDK=8
 KARTOTHEK=latest
-LLVM=12
+# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
+LLVM=13
 MAVEN=3.5.4
 NODE=16
 NUMPY=latest
diff --git a/ci/docker/ubuntu-18.04-verify-rc.dockerfile b/ci/docker/ubuntu-18.04-verify-rc.dockerfile
index 88a74b6003..d210e01d9d 100644
--- a/ci/docker/ubuntu-18.04-verify-rc.dockerfile
+++ b/ci/docker/ubuntu-18.04-verify-rc.dockerfile
@@ -19,42 +19,8 @@ ARG arch=amd64
 FROM ${arch}/ubuntu:18.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-
-ARG llvm=12
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-       apt-transport-https \
-       ca-certificates \
-       gnupg \
-       wget && \
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-    echo "deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-${llvm} main" > \
-       /etc/apt/sources.list.d/llvm.list && \
-    apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-        build-essential \
-        clang \
-        cmake \
-        curl \
-        git \
-        libcurl4-openssl-dev \
-        libgirepository1.0-dev \
-        libglib2.0-dev \
-        libsqlite3-dev \
-        libssl-dev \
-        llvm-${llvm}-dev \
-        maven \
-        ninja-build \
-        openjdk-11-jdk \
-        pkg-config \
-        python3-pip \
-        python3.8-dev \
-        python3.8-venv \
-        ruby-dev \
-        wget \
-        tzdata && \
+COPY dev/release/setup-ubuntu.sh /
+RUN /setup-ubuntu.sh && \
+    rm /setup-ubuntu.sh && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
-
-RUN python3.8 -m pip install -U pip && \
-    update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
diff --git a/ci/docker/ubuntu-20.04-verify-rc.dockerfile b/ci/docker/ubuntu-20.04-verify-rc.dockerfile
index e3415bd745..cee1e50e08 100644
--- a/ci/docker/ubuntu-20.04-verify-rc.dockerfile
+++ b/ci/docker/ubuntu-20.04-verify-rc.dockerfile
@@ -19,28 +19,8 @@ ARG arch=amd64
 FROM ${arch}/ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-        build-essential \
-        clang \
-        cmake \
-        curl \
-        git \
-        libcurl4-openssl-dev \
-        libgirepository1.0-dev \
-        libglib2.0-dev \
-        libsqlite3-dev \
-        libssl-dev \
-        llvm-dev \
-        maven \
-        ninja-build \
-        nlohmann-json3-dev \
-        openjdk-11-jdk \
-        pkg-config \
-        python3-dev \
-        python3-pip \
-        python3-venv \
-        ruby-dev \
-        wget && \
+COPY dev/release/setup-ubuntu.sh /
+RUN /setup-ubuntu.sh && \
+    rm /setup-ubuntu.sh && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
diff --git a/ci/docker/ubuntu-21.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
similarity index 50%
copy from ci/docker/ubuntu-21.04-cpp.dockerfile
copy to ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
index ff0979ea64..8bc5ab3e48 100644
--- a/ci/docker/ubuntu-21.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG base=amd64/ubuntu:21.04
+ARG base=amd64/ubuntu:22.04
 FROM ${base}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -23,15 +23,26 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN echo "debconf debconf/frontend select Noninteractive" | \
         debconf-set-selections
 
+RUN apt-get update -y -q && \
+    apt-get install -y -q \
+        build-essential \
+        ccache \
+        cmake \
+        git \
+        libssl-dev \
+        libcurl4-openssl-dev \
+        python3-pip \
+        wget && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists*
+
 # Installs LLVM toolchain, for Gandiva and testing other compilers
 #
 # Note that this is installed before the base packages to improve iteration
 # while debugging package list with docker build.
-ARG clang_tools
 ARG llvm
-RUN latest_system_llvm=12 && \
-    if [ ${llvm} -gt ${latest_system_llvm} -o \
-         ${clang_tools} -gt ${latest_system_llvm} ]; then \
+RUN latest_system_llvm=14 && \
+    if [ ${llvm} -gt ${latest_system_llvm} ]; then \
       apt-get update -y -q && \
       apt-get install -y -q --no-install-recommends \
           apt-transport-https \
@@ -44,85 +55,26 @@ RUN latest_system_llvm=12 && \
       if [ ${llvm} -gt 10 ]; then \
         echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${llvm} main" > \
            /etc/apt/sources.list.d/llvm.list; \
-      fi && \
-      if [ ${clang_tools} -ne ${llvm} -a \
-           ${clang_tools} -gt ${latest_system_llvm} ]; then \
-        echo "deb https://apt.llvm.org/${code_name}/ llvm-toolchain-${code_name}-${clang_tools} main" > \
-           /etc/apt/sources.list.d/clang-tools.list; \
       fi; \
     fi && \
     apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
-        clang-${clang_tools} \
         clang-${llvm} \
-        clang-format-${clang_tools} \
-        clang-tidy-${clang_tools} \
         llvm-${llvm}-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
 
-# Installs C++ toolchain and dependencies
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-        autoconf \
-        ca-certificates \
-        ccache \
-        cmake \
-        gdb \
-        git \
-        libbenchmark-dev \
-        libboost-filesystem-dev \
-        libboost-system-dev \
-        libbrotli-dev \
-        libbz2-dev \
-        libc-ares-dev \
-        libcurl4-openssl-dev \
-        libgflags-dev \
-        libgoogle-glog-dev \
-        libgrpc++-dev \
-        liblz4-dev \
-        libprotobuf-dev \
-        libprotoc-dev \
-        libre2-dev \
-        libsnappy-dev \
-        libssl-dev \
-        libsqlite3-dev \
-        libthrift-dev \
-        libutf8proc-dev \
-        libzstd-dev \
-        make \
-        ninja-build \
-        nlohmann-json3-dev \
-        pkg-config \
-        protobuf-compiler \
-        protobuf-compiler-grpc \
-        python3-pip \
-        rapidjson-dev \
-        rsync \
-        tzdata \
-        wget && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists*
-
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
 
 COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_gcs_testbench.sh default
 
-# Prioritize system packages and local installation
-# The following dependencies will be downloaded due to missing/invalid packages
-# provided by the distribution:
-# - libc-ares-dev does not install CMake config files
-# - flatbuffer is not packaged
-# - libgtest-dev only provide sources
-# - libprotobuf-dev only provide sources
 ENV ARROW_BUILD_TESTS=ON \
-    ARROW_DEPENDENCY_SOURCE=SYSTEM \
     ARROW_DATASET=ON \
     ARROW_FLIGHT=ON \
-    ARROW_FLIGHT_SQL=ON \
     ARROW_GANDIVA=ON \
+    ARROW_GCS=ON \
     ARROW_HDFS=ON \
     ARROW_HOME=/usr/local \
     ARROW_INSTALL_NAME_RPATH=OFF \
@@ -131,9 +83,7 @@ ENV ARROW_BUILD_TESTS=ON \
     ARROW_PARQUET=ON \
     ARROW_PLASMA=ON \
     ARROW_S3=ON \
-    ARROW_USE_ASAN=OFF \
     ARROW_USE_CCACHE=ON \
-    ARROW_USE_UBSAN=OFF \
     ARROW_WITH_BROTLI=ON \
     ARROW_WITH_BZ2=ON \
     ARROW_WITH_LZ4=ON \
@@ -141,35 +91,8 @@ ENV ARROW_BUILD_TESTS=ON \
     ARROW_WITH_SNAPPY=ON \
     ARROW_WITH_ZLIB=ON \
     ARROW_WITH_ZSTD=ON \
-    AWSSDK_SOURCE=BUNDLED \
-    GTest_SOURCE=BUNDLED \
-    ORC_SOURCE=BUNDLED \
+    CMAKE_GENERATOR="Unix Makefiles" \
     PARQUET_BUILD_EXAMPLES=ON \
     PARQUET_BUILD_EXECUTABLES=ON \
-    Protobuf_SOURCE=BUNDLED \
     PATH=/usr/lib/ccache/:$PATH \
     PYTHON=python3
-
-ARG gcc_version=""
-RUN if [ "${gcc_version}" = "" ]; then \
-      apt-get update -y -q && \
-      apt-get install -y -q --no-install-recommends \
-          g++ \
-          gcc; \
-    else \
-      if [ "${gcc_version}" -gt "10" ]; then \
-          apt-get update -y -q && \
-          apt-get install -y -q --no-install-recommends software-properties-common && \
-          add-apt-repository ppa:ubuntu-toolchain-r/volatile; \
-      fi; \
-      apt-get update -y -q && \
-      apt-get install -y -q --no-install-recommends \
-          g++-${gcc_version} \
-          gcc-${gcc_version} && \
-      update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \
-      update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \
-      update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 && \
-      update-alternatives --set cc /usr/bin/gcc && \
-      update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100 && \
-      update-alternatives --set c++ /usr/bin/g++; \
-    fi
diff --git a/ci/docker/ubuntu-21.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp.dockerfile
similarity index 91%
rename from ci/docker/ubuntu-21.04-cpp.dockerfile
rename to ci/docker/ubuntu-22.04-cpp.dockerfile
index ff0979ea64..92d802f876 100644
--- a/ci/docker/ubuntu-21.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-22.04-cpp.dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG base=amd64/ubuntu:21.04
+ARG base=amd64/ubuntu:22.04
 FROM ${base}
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -29,7 +29,7 @@ RUN echo "debconf debconf/frontend select Noninteractive" | \
 # while debugging package list with docker build.
 ARG clang_tools
 ARG llvm
-RUN latest_system_llvm=12 && \
+RUN latest_system_llvm=14 && \
     if [ ${llvm} -gt ${latest_system_llvm} -o \
          ${clang_tools} -gt ${latest_system_llvm} ]; then \
       apt-get update -y -q && \
@@ -96,6 +96,7 @@ RUN apt-get update -y -q && \
         pkg-config \
         protobuf-compiler \
         protobuf-compiler-grpc \
+        python3-dev \
         python3-pip \
         rapidjson-dev \
         rsync \
@@ -104,6 +105,38 @@ RUN apt-get update -y -q && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
 
+ARG gcc_version=""
+RUN if [ "${gcc_version}" = "" ]; then \
+      apt-get update -y -q && \
+      apt-get install -y -q --no-install-recommends \
+          g++ \
+          gcc; \
+    else \
+      if [ "${gcc_version}" -gt "11" ]; then \
+          apt-get update -y -q && \
+          apt-get install -y -q --no-install-recommends software-properties-common && \
+          add-apt-repository ppa:ubuntu-toolchain-r/volatile; \
+      fi; \
+      apt-get update -y -q && \
+      apt-get install -y -q --no-install-recommends \
+          g++-${gcc_version} \
+          gcc-${gcc_version} && \
+      update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \
+      update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \
+      update-alternatives --install \
+        /usr/bin/$(uname --machine)-linux-gnu-gcc \
+        $(uname --machine)-linux-gnu-gcc \
+        /usr/bin/$(uname --machine)-linux-gnu-gcc-${gcc_version} 100 && \
+      update-alternatives --install \
+        /usr/bin/$(uname --machine)-linux-gnu-g++ \
+        $(uname --machine)-linux-gnu-g++ \
+        /usr/bin/$(uname --machine)-linux-gnu-g++-${gcc_version} 100 && \
+      update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 && \
+      update-alternatives --set cc /usr/bin/gcc && \
+      update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100 && \
+      update-alternatives --set c++ /usr/bin/g++; \
+    fi
+
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
 
@@ -149,27 +182,3 @@ ENV ARROW_BUILD_TESTS=ON \
     Protobuf_SOURCE=BUNDLED \
     PATH=/usr/lib/ccache/:$PATH \
     PYTHON=python3
-
-ARG gcc_version=""
-RUN if [ "${gcc_version}" = "" ]; then \
-      apt-get update -y -q && \
-      apt-get install -y -q --no-install-recommends \
-          g++ \
-          gcc; \
-    else \
-      if [ "${gcc_version}" -gt "10" ]; then \
-          apt-get update -y -q && \
-          apt-get install -y -q --no-install-recommends software-properties-common && \
-          add-apt-repository ppa:ubuntu-toolchain-r/volatile; \
-      fi; \
-      apt-get update -y -q && \
-      apt-get install -y -q --no-install-recommends \
-          g++-${gcc_version} \
-          gcc-${gcc_version} && \
-      update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \
-      update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \
-      update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 && \
-      update-alternatives --set cc /usr/bin/gcc && \
-      update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100 && \
-      update-alternatives --set c++ /usr/bin/g++; \
-    fi
diff --git a/dev/release/setup-ubuntu.sh b/ci/docker/ubuntu-22.04-verify-rc.dockerfile
old mode 100755
new mode 100644
similarity index 65%
copy from dev/release/setup-ubuntu.sh
copy to ci/docker/ubuntu-22.04-verify-rc.dockerfile
index 67dd5f7d47..8bc6f39b67
--- a/dev/release/setup-ubuntu.sh
+++ b/ci/docker/ubuntu-22.04-verify-rc.dockerfile
@@ -15,27 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# A script to install dependencies required for release
-# verification on Ubuntu 20.04
+ARG arch=amd64
+FROM ${arch}/ubuntu:22.04
 
-apt-get update
-apt-get -y install \
-  build-essential \
-  clang \
-  cmake \
-  curl \
-  git \
-  libcurl4-openssl-dev \
-  libgirepository1.0-dev \
-  libglib2.0-dev \
-  libsqlite3-dev \
-  libssl-dev \
-  llvm-dev \
-  maven \
-  ninja-build \
-  openjdk-11-jdk \
-  pkg-config \
-  python3-pip \
-  python3-venv \
-  ruby-dev \
-  wget
+ENV DEBIAN_FRONTEND=noninteractive
+COPY dev/release/setup-ubuntu.sh /
+RUN /setup-ubuntu.sh && \
+    rm /setup-ubuntu.sh && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists*
diff --git a/dev/release/setup-ubuntu.sh b/dev/release/setup-ubuntu.sh
index 67dd5f7d47..c2a522ceb1 100755
--- a/dev/release/setup-ubuntu.sh
+++ b/dev/release/setup-ubuntu.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,10 +18,40 @@
 # under the License.
 
 # A script to install dependencies required for release
-# verification on Ubuntu 20.04
+# verification on Ubuntu.
+
+set -exu
+
+codename=$(. /etc/os-release && echo ${UBUNTU_CODENAME})
 
-apt-get update
-apt-get -y install \
+case ${codename} in
+  bionic)
+    llvm=12
+    nlohmann_json=
+    python=3.8
+    apt-get update -y -q
+    apt-get install -y -q --no-install-recommends \
+      apt-transport-https \
+      ca-certificates \
+      gnupg \
+      wget
+    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
+    echo "deb https://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${llvm} main" > \
+      /etc/apt/sources.list.d/llvm.list
+    apt-get update -y -q
+    apt-get install -y -q --no-install-recommends \
+      llvm-${llvm}-dev
+    ;;
+  *)
+    nlohmann_json=3
+    python=3
+    apt-get update -y -q
+    apt-get install -y -q --no-install-recommends \
+      llvm-dev
+    ;;
+esac
+
+apt-get install -y -q --no-install-recommends \
   build-essential \
   clang \
   cmake \
@@ -30,12 +62,22 @@ apt-get -y install \
   libglib2.0-dev \
   libsqlite3-dev \
   libssl-dev \
-  llvm-dev \
   maven \
   ninja-build \
+  nlohmann-json${nlohmann_json}-dev \
   openjdk-11-jdk \
   pkg-config \
   python3-pip \
-  python3-venv \
+  python${python}-dev \
+  python${python}-venv \
   ruby-dev \
-  wget
+  wget \
+  tzdata
+
+case ${codename} in
+  bionic)
+    python${python} -m pip install -U pip
+    update-alternatives \
+      --install /usr/bin/python3 python3 /usr/bin/python${python} 1
+    ;;
+esac
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 060bbcbdde..a17f9ec68a 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -900,7 +900,8 @@ tasks:
 {% for distribution, version in [("conda", "latest"),
                                  ("almalinux", "8"),
                                  ("ubuntu", "18.04"),
-                                 ("ubuntu", "20.04")] %}
+                                 ("ubuntu", "20.04"),
+                                 ("ubuntu", "22.04")] %}
   {% for target in ["cpp",
                     "csharp",
                     "go",
@@ -1060,7 +1061,7 @@ tasks:
     params:
       image: conda-cpp-valgrind
 
-{% for ubuntu_version in ["18.04", "20.04", "21.04"] %}
+{% for ubuntu_version in ["18.04", "20.04", "22.04"] %}
   test-ubuntu-{{ ubuntu_version }}-cpp:
     ci: github
     template: docker-tests/github.linux.yml
@@ -1305,12 +1306,12 @@ tasks:
       flags: '-e NOT_CRAN=false -e INSTALL_ARGS=--use-LTO'
 
   # This one has -flto=auto
-  test-r-ubuntu-21.04:
+  test-r-ubuntu-22.04:
     ci: github
     template: docker-tests/github.linux.yml
     params:
       env:
-        UBUNTU: 21.04
+        UBUNTU: 22.04
         R_PRUNE_DEPS: TRUE
       image: ubuntu-r-only-r
 
@@ -1320,7 +1321,7 @@ tasks:
     template: docker-tests/github.linux.yml
     params:
       env:
-        UBUNTU: 21.04
+        UBUNTU: 22.04
         GCC_VERSION: 11
       # S3 support is not buildable with gcc11 right now
       flags: '-e ARROW_S3=OFF'
diff --git a/docker-compose.yml b/docker-compose.yml
index f1245525fc..8d5dfcd717 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1736,8 +1736,8 @@ services:
 
   almalinux-verify-rc:
     # Usage:
-    #   docker-compose build almalinux-verify-rc-source
-    #   docker-compose run -e VERIFY_VERSION=6.0.1 -e VERIFY_RC=1 almalinux-verify-rc-source
+    #   docker-compose build almalinux-verify-rc
+    #   docker-compose run -e VERIFY_VERSION=6.0.1 -e VERIFY_RC=1 almalinux-verify-rc
     # Parameters:
     #   ALMALINUX: 8
     image: ${REPO}:${ARCH}-almalinux-${ALMALINUX}-verify-rc
@@ -1764,10 +1764,10 @@ services:
 
   ubuntu-verify-rc:
     # Usage:
-    #   docker-compose build ubuntu-verify-rc-source
-    #   docker-compose run -e VERIFY_VERSION=6.0.1 -e VERIFY_RC=1 ubuntu-verify-rc-source
+    #   docker-compose build ubuntu-verify-rc
+    #   docker-compose run -e VERIFY_VERSION=6.0.1 -e VERIFY_RC=1 ubuntu-verify-rc
     # Parameters:
-    #   UBUNTU: 18.04, 20.04
+    #   UBUNTU: 18.04, 20.04, 22.04
     image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-verify-rc
     build:
       context: .