diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8 index e946cfbd2e..20e8a73625 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,8 @@ 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}" \ + "python3.11-pip${PYTHON_PIP_VERSION}" \ "tar${TAR_VERSION}" \ "procps-ng${PROCPS_VERSION}" \ "krb5-workstation${KRB5_WORKSTATION_VERSION}" \ @@ -99,7 +99,8 @@ RUN microdnf --nodocs install yum \ "curl${CURL_VERSION}" \ "libcurl${CURL_VERSION}" \ "zulu11-ca-jdk-headless${ZULU_OPENJDK_VERSION}" "zulu11-ca-jre-headless${ZULU_OPENJDK_VERSION}" \ - && alternatives --set python /usr/bin/python3 \ + && alternatives --set python /usr/bin/python3.11 \ + && alternatives --set python3 /usr/bin/python3.11 \ && 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}" \ && yum remove -y git \ diff --git a/base/pom.xml b/base/pom.xml index 98c470f940..d8b2f642d7 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -126,7 +126,7 @@ -${ubi8-minimal.openssl.version} -${ubi8-minimal.wget.version} -${ubi8-minimal.nmap-ncat.version} - -${ubi8-minimal.python39.version} + -${ubi8-minimal.python311.version} -${ubi8-minimal.tar.version} -${ubi8-minimal.procps-ng.version} -${ubi8-minimal.krb5-workstation.version} @@ -136,7 +136,7 @@ -${ubi8-minimal.glibc.version} -${ubi8-minimal.curl.version} -${ubi8-minimal.zulu11-ca-jdk-headless.version} - -${ubi8-minimal.python39-pip.version} + -${ubi8-minimal.python311-pip.version} ==${python.setuptools.version} ${git-repo.confluent-docker-utils.tag} ${docker.skip-security-update-check} @@ -156,7 +156,7 @@ -${ubi8-minimal.openssl.version} -${ubi8-minimal.wget.version} -${ubi8-minimal.nmap-ncat.version} - -${ubi8-minimal.python39.version} + -${ubi8-minimal.python311.version} -${ubi8-minimal.tar.version} -${ubi8-minimal.procps-ng.version} -${ubi8-minimal.krb5-workstation.version} @@ -166,7 +166,7 @@ -${ubi8-minimal.glibc.version} -${ubi8-minimal.curl.version} -${ubi8-minimal.zulu11-ca-jdk-headless.version} - -${ubi8-minimal.python39-pip.version} + -${ubi8-minimal.python311-pip.version} ==${python.setuptools.version} ${git-repo.confluent-docker-utils.tag} ${docker.skip-security-update-check} diff --git a/pom.xml b/pom.xml index 16c71ac915..5e495e0f96 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 1.1.1k-14.el8_6 1.19.5-12.el8_10 7.92-1.el8 - 3.9.20-2.module+el8.10.0+23441+1124c1da + 3.11.13-2.el8_10 1.30-11.el8_10 3.3.15-14.el8 1.18.2-32.el8_10 @@ -80,7 +80,7 @@ 2.28-251.el8_10.25 7.61.1-34.el8_10.8 11.0.29-1 - 20.2.4-9.module+el8.10.0+21329+8d76b841 + 22.3.1-5.el8 80.9.0