diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8 index e946cfbd2e..8f50436b99 100644 --- a/base/Dockerfile.ubi8 +++ b/base/Dockerfile.ubi8 @@ -53,7 +53,7 @@ ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"' ARG OPENSSL_VERSION="" ARG WGET_VERSION="" ARG NETCAT_VERSION="" -ARG PYTHON39_VERSION="" +ARG PYTHON311_VERSION="" ARG TAR_VERSION="" ARG PROCPS_VERSION="" ARG KRB5_WORKSTATION_VERSION="" @@ -74,7 +74,7 @@ ARG PYTHON_SETUPTOOLS_VERSION="" ARG PYTHON_CONFLUENT_DOCKER_UTILS_VERSION="master" # This can be overriden for an offline/air-gapped builds -ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@${PYTHON_CONFLUENT_DOCKER_UTILS_VERSION}" +ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@replace-docker-compose" RUN microdnf --nodocs install yum \ && rpm --import https://www.azul.com/files/0xB1998361219BD9C9.txt \ @@ -85,8 +85,10 @@ RUN microdnf --nodocs install yum \ "openssl${OPENSSL_VERSION}" \ "wget${WGET_VERSION}" \ "nmap-ncat${NETCAT_VERSION}" \ - "python39${PYTHON39_VERSION}" \ - "python39-pip${PYTHON_PIP_VERSION}" \ + "python3.11${PYTHON311_VERSION}" + +RUN yum --nodocs install -y --setopt=install_weak_deps=False \ + "python3.11-pip${PYTHON_PIP_VERSION}" \ "tar${TAR_VERSION}" \ "procps-ng${PROCPS_VERSION}" \ "krb5-workstation${KRB5_WORKSTATION_VERSION}" \ @@ -100,8 +102,9 @@ RUN microdnf --nodocs install yum \ "libcurl${CURL_VERSION}" \ "zulu11-ca-jdk-headless${ZULU_OPENJDK_VERSION}" "zulu11-ca-jre-headless${ZULU_OPENJDK_VERSION}" \ && alternatives --set python /usr/bin/python3 \ - && python3 -m pip install --upgrade "setuptools${PYTHON_SETUPTOOLS_VERSION}" \ - && python3 -m pip install --prefer-binary --prefix=/usr/local --upgrade "${PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC}" \ + && python3 -m pip install --upgrade "setuptools${PYTHON_SETUPTOOLS_VERSION}" + +RUN python3 -m pip install --prefer-binary --prefix=/usr/local --upgrade "${PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC}" \ && yum remove -y git \ && yum clean all \ && rm -rf /tmp/* \ diff --git a/base/pom.xml b/base/pom.xml index c98b586a8c..a420258e6f 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -126,7 +126,7 @@ -${ubi8.openssl.version} -${ubi8.wget.version} -${ubi8.netcat.version} - -${ubi8.python39.version} + -${ubi8.python311.version} -${ubi8.tar.version} -${ubi8.procps.version} -${ubi8.krb5.workstation.version} @@ -156,7 +156,7 @@ -${ubi8.openssl.version} -${ubi8.wget.version} -${ubi8.netcat.version} - -${ubi8.python39.version} + -${ubi8.python311.version} -${ubi8.tar.version} -${ubi8.procps.version} -${ubi8.krb5.workstation.version} diff --git a/pom.xml b/pom.xml index 36b954181e..0506a9bcba 100644 --- a/pom.xml +++ b/pom.xml @@ -37,8 +37,8 @@ 1:1.1.1k-14.el8_6 1.19.5-12.el8_10 7.92-1.el8 - 3.9.20-1.module+el8.10.0+22342+478c159e - 1.30-10.el8_10 + 3.11.13-2.el8_10 + 1.30-11.el8_10 3.3.15-14.el8 1.18.2-32.el8_10 20180629-11.el8 @@ -49,7 +49,7 @@ 11.0.28-1 - 20.* + 22.* 78.1.1 v0.0.162