Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions base/Dockerfile.ubi8
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand All @@ -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 \
Expand All @@ -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}" \
Expand All @@ -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/* \
Expand Down
4 changes: 2 additions & 2 deletions base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<OPENSSL_VERSION>-${ubi8.openssl.version}</OPENSSL_VERSION>
<WGET_VERSION>-${ubi8.wget.version}</WGET_VERSION>
<NETCAT_VERSION>-${ubi8.netcat.version}</NETCAT_VERSION>
<PYTHON39_VERSION>-${ubi8.python39.version}</PYTHON39_VERSION>
<PYTHON311_VERSION>-${ubi8.python311.version}</PYTHON311_VERSION>
<TAR_VERSION>-${ubi8.tar.version}</TAR_VERSION>
<PROCPS_VERSION>-${ubi8.procps.version}</PROCPS_VERSION>
<KRB5_WORKSTATION_VERSION>-${ubi8.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
Expand Down Expand Up @@ -156,7 +156,7 @@
<OPENSSL_VERSION>-${ubi8.openssl.version}</OPENSSL_VERSION>
<WGET_VERSION>-${ubi8.wget.version}</WGET_VERSION>
<NETCAT_VERSION>-${ubi8.netcat.version}</NETCAT_VERSION>
<PYTHON39_VERSION>-${ubi8.python39.version}</PYTHON39_VERSION>
<PYTHON311_VERSION>-${ubi8.python311.version}</PYTHON311_VERSION>
<TAR_VERSION>-${ubi8.tar.version}</TAR_VERSION>
<PROCPS_VERSION>-${ubi8.procps.version}</PROCPS_VERSION>
<KRB5_WORKSTATION_VERSION>-${ubi8.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<ubi8.openssl.version>1:1.1.1k-14.el8_6</ubi8.openssl.version>
<ubi8.wget.version>1.19.5-12.el8_10</ubi8.wget.version>
<ubi8.netcat.version>7.92-1.el8</ubi8.netcat.version>
<ubi8.python39.version>3.9.20-1.module+el8.10.0+22342+478c159e</ubi8.python39.version>
<ubi8.tar.version>1.30-10.el8_10</ubi8.tar.version>
<ubi8.python311.version>3.11.13-2.el8_10</ubi8.python311.version>
<ubi8.tar.version>1.30-11.el8_10</ubi8.tar.version>
<ubi8.procps.version>3.3.15-14.el8</ubi8.procps.version>
<ubi8.krb5.workstation.version>1.18.2-32.el8_10</ubi8.krb5.workstation.version>
<ubi8.iputils.version>20180629-11.el8</ubi8.iputils.version>
Expand All @@ -49,7 +49,7 @@
<!-- ZULU OpenJDK Package Version -->
<ubi.zulu.openjdk.version>11.0.28-1</ubi.zulu.openjdk.version>
<!-- Python Module Versions -->
<ubi8.python.pip.version>20.*</ubi8.python.pip.version>
<ubi8.python.pip.version>22.*</ubi8.python.pip.version>
<ubi.python.setuptools.version>78.1.1</ubi.python.setuptools.version>
<ubi.python.confluent.docker.utils.version>v0.0.162</ubi.python.confluent.docker.utils.version>
<!-- In base/{pom.xml,Dockerfile.ubi} this property is used to to fail a build if the Yum/Dnf package manager
Expand Down