This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new ac09fa3cf [mesos-build] Update reviewbot / tidybot / docker-build.sh
to support ubuntu 20.04.
ac09fa3cf is described below
commit ac09fa3cf60e55ca0c1771184d127b24de7c670b
Author: Jason Zhou <[email protected]>
AuthorDate: Wed Jun 5 00:43:06 2024 -0400
[mesos-build] Update reviewbot / tidybot / docker-build.sh to support
ubuntu 20.04.
The reviewbot, tidybot, and our docker-build scripts
have been updated to use or accomodate for ubuntu 20.04.
Review: https://reviews.apache.org/r/75027/
---
support/docker-build.sh | 28 ++++++++++++++++++++++++++++
support/jenkins/reviewbot.sh | 2 +-
support/mesos-build/entrypoint.sh | 1 +
support/mesos-tidy/Dockerfile | 2 +-
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/support/docker-build.sh b/support/docker-build.sh
index 4f4019001..f1893e0b3 100755
--- a/support/docker-build.sh
+++ b/support/docker-build.sh
@@ -64,6 +64,12 @@ case $OS in
append_dockerfile "FROM $OS"
+ case $OS in
+ *20.04*)
+ append_dockerfile "ARG DEBIAN_FRONTEND=noninteractive"
+ ;;
+ esac
+
# NOTE: We need to do this to fix some flakiness while fetching packages.
# See https://bugs.launchpad.net/ubuntu/+source/apt/+bug/972077
append_dockerfile "RUN rm -rf /var/lib/apt/lists/*"
@@ -96,6 +102,28 @@ case $OS in
# Install pip for Python 3.6.
append_dockerfile "RUN curl
https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3"
;;
+ *20.04*)
+ echo "Install Ubuntu 20.04 LTS (Focal Fossa) specific packages"
+ append_dockerfile "RUN apt-get install -y openjdk-8-jdk zlib1g-dev"
+ # Install ping required by OsTest.Which
+ append_dockerfile "RUN apt-get install -y iputils-ping"
+
+ append_dockerfile "RUN add-apt-repository -y ppa:deadsnakes/ppa && \
+ apt-get update && \
+ apt-get install -qy \
+ python3.6 \
+ python3.6-dev \
+ python3.6-distutils \
+ python3.6-venv && \
+ add-apt-repository --remove -y ppa:deadsnakes/ppa && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists"
+
+ # Use update-alternatives to set python3.6 as python3.
+ append_dockerfile "RUN update-alternatives --install /usr/bin/python3
python3 /usr/bin/python3.6 1"
+ # Install pip for Python 3.6.
+ append_dockerfile "RUN curl
https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3"
+ ;;
*)
append_dockerfile "RUN apt-get install -y openjdk-7-jdk"
;;
diff --git a/support/jenkins/reviewbot.sh b/support/jenkins/reviewbot.sh
index 349e18dfd..03ebcd600 100755
--- a/support/jenkins/reviewbot.sh
+++ b/support/jenkins/reviewbot.sh
@@ -44,7 +44,7 @@ fi
# Build the HEAD first to ensure that there are no errors prior to applying
# the review chain. We do not run tests at this stage.
-export OS='ubuntu:16.04'
+export OS='ubuntu:20.04'
export BUILDTOOL='autotools'
export COMPILER='gcc'
export CONFIGURATION='--verbose --disable-libtool-wrappers
--disable-parallel-test-execution'
diff --git a/support/mesos-build/entrypoint.sh
b/support/mesos-build/entrypoint.sh
index 865c44aef..2e1e26130 100755
--- a/support/mesos-build/entrypoint.sh
+++ b/support/mesos-build/entrypoint.sh
@@ -23,6 +23,7 @@ SRCDIR=/tmp/SRC
# Prepare sources
git clone --depth 1 file:///SRC "${SRCDIR}"
+git config --global --add safe.directory /SRC/.git
cd "${SRCDIR}"
diff --git a/support/mesos-tidy/Dockerfile b/support/mesos-tidy/Dockerfile
index db66a8575..769a22d9e 100644
--- a/support/mesos-tidy/Dockerfile
+++ b/support/mesos-tidy/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:xenial
+FROM ubuntu:20.04
MAINTAINER The Apache Mesos Developers <[email protected]>
WORKDIR /tmp/build
