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 <[email protected]> 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
