You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2024/06/07 18:35:12 UTC
(mesos) branch master updated (ac8765c8a -> 4e6375bc0)
This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
from ac8765c8a [mesos-build] Address dependency issues in centos-7 / ubuntu-20.04.
new 193dd6458 [mesos-build] Add /SRC/.git as safe directory for tidybot.
new 4e6375bc0 [mesos-build] Remove setting of environment variable in dockerfiles.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
support/mesos-build/ubuntu-20.04-arm.dockerfile | 10 +++++-----
support/mesos-build/ubuntu-20.04.dockerfile | 10 +++++-----
support/mesos-tidy/entrypoint.sh | 5 +++++
3 files changed, 15 insertions(+), 10 deletions(-)
(mesos) 01/02: [mesos-build] Add /SRC/.git as safe directory for tidybot.
Posted by bm...@apache.org.
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
commit 193dd64580e5e9337ed20218d6a1db4fe5dbac31
Author: Jason Zhou <ja...@gmail.com>
AuthorDate: Fri Jun 7 14:34:05 2024 -0400
[mesos-build] Add /SRC/.git as safe directory for tidybot.
This change allows us to bypass the git directory warnings for tidybot.
As part of this change we will have to rebuild the tidybot image and
push it to dockerhub.
Review: https://reviews.apache.org/r/75037/
---
support/mesos-tidy/entrypoint.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/support/mesos-tidy/entrypoint.sh b/support/mesos-tidy/entrypoint.sh
index 70e6c3133..86271dfa2 100755
--- a/support/mesos-tidy/entrypoint.sh
+++ b/support/mesos-tidy/entrypoint.sh
@@ -21,6 +21,11 @@ set -o pipefail
SRCDIR=/tmp/SRC
+# NOTE: Higher ubuntu versions seem to give the following warning:
+# "detected dubious ownership in repository at '/SRC/.git'"
+# we will add an exception for this directory.
+git config --global --add safe.directory /SRC/.git
+
# Prepare sources
git clone --depth 1 file:///SRC "${SRCDIR}"
(mesos) 02/02: [mesos-build] Remove setting of environment variable in dockerfiles.
Posted by bm...@apache.org.
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
commit 4e6375bc071a33821d2fdc15c0d2d5a0b555676e
Author: Jason Zhou <ja...@gmail.com>
AuthorDate: Fri Jun 7 14:34:32 2024 -0400
[mesos-build] Remove setting of environment variable in dockerfiles.
Setting an environment variable as PYTHON_VERSION caused an unexpected
behavior in jenkins as the configure.ac script checked for that exact
environment variable.
PYTHON_VERSION has been renamed and set as an ARG in the dockerfile
so that it will not persist after the build.
Review: https://reviews.apache.org/r/75036/
---
support/mesos-build/ubuntu-20.04-arm.dockerfile | 10 +++++-----
support/mesos-build/ubuntu-20.04.dockerfile | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/support/mesos-build/ubuntu-20.04-arm.dockerfile b/support/mesos-build/ubuntu-20.04-arm.dockerfile
index 50f15039f..a3b321fb7 100644
--- a/support/mesos-build/ubuntu-20.04-arm.dockerfile
+++ b/support/mesos-build/ubuntu-20.04-arm.dockerfile
@@ -46,16 +46,16 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists
# Install Python 3.6.
-ENV PYTHON_VERSION=3.6.15
+ARG PYTHON_TARGET_VERSION=3.6.15
# Download and install Python from source
-RUN curl https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz -o /tmp/Python-$PYTHON_VERSION.tgz && \
+RUN curl https://www.python.org/ftp/python/$PYTHON_TARGET_VERSION/Python-$PYTHON_TARGET_VERSION.tgz -o /tmp/Python-$PYTHON_TARGET_VERSION.tgz && \
cd /tmp && \
- tar xzf Python-$PYTHON_VERSION.tgz && \
- cd Python-$PYTHON_VERSION && \
+ tar xzf Python-$PYTHON_TARGET_VERSION.tgz && \
+ cd Python-$PYTHON_TARGET_VERSION && \
./configure --enable-optimizations && \
make altinstall && \
- rm -rf /tmp/Python-$PYTHON_VERSION.tgz /tmp/Python-$PYTHON_VERSION
+ rm -rf /tmp/Python-$PYTHON_TARGET_VERSION.tgz /tmp/Python-$PYTHON_TARGET_VERSION
# Use update-alternatives to set python3.6 as python3.
RUN update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.6 1
diff --git a/support/mesos-build/ubuntu-20.04.dockerfile b/support/mesos-build/ubuntu-20.04.dockerfile
index 5b03356f5..e183ff742 100644
--- a/support/mesos-build/ubuntu-20.04.dockerfile
+++ b/support/mesos-build/ubuntu-20.04.dockerfile
@@ -52,16 +52,16 @@ RUN curl -sSL https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.sh \
rm -f /tmp/install-cmake.sh
# Install Python 3.6.
-ENV PYTHON_VERSION=3.6.15
+ARG PYTHON_TARGET_VERSION=3.6.15
# Download and install Python from source
-RUN curl https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz -o /tmp/Python-$PYTHON_VERSION.tgz && \
+RUN curl https://www.python.org/ftp/python/$PYTHON_TARGET_VERSION/Python-$PYTHON_TARGET_VERSION.tgz -o /tmp/Python-$PYTHON_TARGET_VERSION.tgz && \
cd /tmp && \
- tar xzf Python-$PYTHON_VERSION.tgz && \
- cd Python-$PYTHON_VERSION && \
+ tar xzf Python-$PYTHON_TARGET_VERSION.tgz && \
+ cd Python-$PYTHON_TARGET_VERSION && \
./configure --enable-optimizations && \
make altinstall && \
- rm -rf /tmp/Python-$PYTHON_VERSION.tgz /tmp/Python-$PYTHON_VERSION
+ rm -rf /tmp/Python-$PYTHON_TARGET_VERSION.tgz /tmp/Python-$PYTHON_TARGET_VERSION
# Use update-alternatives to set python3.6 as python3.
RUN update-alternatives --install /usr/bin/python3 python3 /usr/local/bin/python3.6 1