From 86958d640bab8fb23826e121564d5f87a801dc8e Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Fri, 10 Jan 2025 16:51:22 -0500 Subject: [PATCH] Fix integrations-core builder PYTHON_VERSION warnings --- .builders/images/linux-aarch64/Dockerfile | 10 +++++----- .builders/images/linux-x86_64/Dockerfile | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.builders/images/linux-aarch64/Dockerfile b/.builders/images/linux-aarch64/Dockerfile index 01f9411e2b5ce..0ac6e9a96e745 100644 --- a/.builders/images/linux-aarch64/Dockerfile +++ b/.builders/images/linux-aarch64/Dockerfile @@ -43,15 +43,15 @@ RUN yum install -y libffi-devel && \ SHA256="85a4c1be906d20e5c5a69f2466b00da769c221d6a684acfd3a514dbf5bf10a66" \ RELATIVE_PATH="Python-{{version}}" \ bash install-from-source.sh \ - --prefix=/opt/python/${PYTHON_VERSION} \ + --prefix=/opt/python/${PYTHON3_VERSION} \ --with-ensurepip=yes \ --enable-ipv6 \ --with-dbmliborder= -ENV PATH="/opt/python/${PYTHON_VERSION}/bin:${PATH}" +ENV PATH="/opt/python/${PYTHON3_VERSION}/bin:${PATH}" # Set up virtual environment for Python 3 -RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-warn-script-location --upgrade pip \ - && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-warn-script-location virtualenv \ - && /opt/python/${PYTHON_VERSION}/bin/python3 -m virtualenv /py3 +RUN /opt/python/${PYTHON3_VERSION}/bin/python3 -m pip install --no-warn-script-location --upgrade pip \ + && /opt/python/${PYTHON3_VERSION}/bin/python3 -m pip install --no-warn-script-location virtualenv \ + && /opt/python/${PYTHON3_VERSION}/bin/python3 -m virtualenv /py3 # krb5 for dependencies that require kerberos support RUN \ diff --git a/.builders/images/linux-x86_64/Dockerfile b/.builders/images/linux-x86_64/Dockerfile index 8173484479f57..a6379856de5ec 100644 --- a/.builders/images/linux-x86_64/Dockerfile +++ b/.builders/images/linux-x86_64/Dockerfile @@ -41,12 +41,12 @@ RUN yum install -y libffi-devel && \ VERSION="${PYTHON3_VERSION}" \ SHA256="85a4c1be906d20e5c5a69f2466b00da769c221d6a684acfd3a514dbf5bf10a66" \ RELATIVE_PATH="Python-{{version}}" \ - bash install-from-source.sh --prefix=/opt/python/${PYTHON_VERSION} --with-ensurepip=yes --enable-ipv6 --with-dbmliborder= -ENV PATH="/opt/python/${PYTHON_VERSION}/bin:${PATH}" + bash install-from-source.sh --prefix=/opt/python/${PYTHON3_VERSION} --with-ensurepip=yes --enable-ipv6 --with-dbmliborder= +ENV PATH="/opt/python/${PYTHON3_VERSION}/bin:${PATH}" # Set up virtual environment for Python 3 -RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-warn-script-location --upgrade pip \ - && /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-warn-script-location virtualenv \ - && /opt/python/${PYTHON_VERSION}/bin/python3 -m virtualenv /py3 +RUN /opt/python/${PYTHON3_VERSION}/bin/python3 -m pip install --no-warn-script-location --upgrade pip \ + && /opt/python/${PYTHON3_VERSION}/bin/python3 -m pip install --no-warn-script-location virtualenv \ + && /opt/python/${PYTHON3_VERSION}/bin/python3 -m virtualenv /py3 # MQ Client library required by pymqi ENV IBM_MQ_VERSION="9.2.4.0"