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
2 changes: 1 addition & 1 deletion .semaphore/cp_dockerfile_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ global_job_config:
commands:
- checkout
- if [[ $SEMAPHORE_GIT_BRANCH =~ ^7\..* ]]; then sem-version java 8; else sem-version java 17; fi
- sem-version python 3.9
- sem-version python 3.14
- . vault-setup
- . cache-maven restore
- pip install tox==3.28.0
Expand Down
2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ global_job_config:
commands:
- checkout
- if [[ $SEMAPHORE_GIT_BRANCH =~ ^7\..* ]]; then sem-version java 8; else sem-version java 17; fi
- sem-version python 3.9
- sem-version python 3.14
- . vault-setup
- . cache-maven restore
- pip install tox==3.28.0
Expand Down
33 changes: 27 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 PYTHON314_VERSION="3.14.0"
ARG TAR_VERSION=""
ARG PROCPS_VERSION=""
ARG KRB5_WORKSTATION_VERSION=""
Expand Down Expand Up @@ -85,9 +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}" \
"tar${TAR_VERSION}" \
"findutils" \
"procps-ng${PROCPS_VERSION}" \
"krb5-workstation${KRB5_WORKSTATION_VERSION}" \
"iputils${IPUTILS_VERSION}" \
Expand All @@ -99,9 +98,31 @@ 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 \
&& 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}" \
gcc \
make \
bzip2-devel \
expat-devel \
gdbm-devel \
libffi-devel \
ncurses-devel \
sqlite-devel \
zlib-devel \
&& cd /tmp \
&& wget -q https://www.python.org/ftp/python/${PYTHON314_VERSION}/Python-${PYTHON314_VERSION}.tgz \
&& tar -xzf Python-${PYTHON314_VERSION}.tgz \
&& cd Python-${PYTHON314_VERSION} \
&& ./configure --prefix=/usr/local --enable-optimizations --with-ensurepip=yes --without-readline \
&& make -j$(nproc) || make -j1 \
&& make altinstall \
&& ln -sf /usr/local/bin/python3.14 /usr/local/bin/python3 \
&& ln -sf /usr/local/bin/python3.14 /usr/local/bin/python \
&& /usr/local/bin/python3.14 -m ensurepip --upgrade \
&& /usr/local/bin/python3.14 -m pip install --upgrade "pip==${PYTHON_PIP_VERSION}" \
&& /usr/local/bin/python3.14 -m pip install --upgrade "setuptools${PYTHON_SETUPTOOLS_VERSION}" \
&& /usr/local/bin/python3.14 -m pip install --prefer-binary --prefix=/usr/local --upgrade "${PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC}" \
&& cd / \
&& rm -rf /tmp/Python-${PYTHON314_VERSION}* \
&& yum remove -y gcc make bzip2-devel expat-devel gdbm-devel libffi-devel ncurses-devel sqlite-devel zlib-devel \
&& yum remove -y git \
&& yum clean all \
&& rm -rf /tmp/* \
Expand Down
8 changes: 4 additions & 4 deletions base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<OPENSSL_VERSION>-${ubi8-minimal.openssl.version}</OPENSSL_VERSION>
<WGET_VERSION>-${ubi8-minimal.wget.version}</WGET_VERSION>
<NETCAT_VERSION>-${ubi8-minimal.nmap-ncat.version}</NETCAT_VERSION>
<PYTHON39_VERSION>-${ubi8-minimal.python39.version}</PYTHON39_VERSION>
<PYTHON314_VERSION>${ubi8-minimal.python314.version}</PYTHON314_VERSION>
<TAR_VERSION>-${ubi8-minimal.tar.version}</TAR_VERSION>
<PROCPS_VERSION>-${ubi8-minimal.procps-ng.version}</PROCPS_VERSION>
<KRB5_WORKSTATION_VERSION>-${ubi8-minimal.krb5-workstation.version}</KRB5_WORKSTATION_VERSION>
Expand All @@ -136,7 +136,7 @@
<GLIBC_VERSION>-${ubi8-minimal.glibc.version}</GLIBC_VERSION>
<CURL_VERSION>-${ubi8-minimal.curl.version}</CURL_VERSION>
<ZULU_OPENJDK_VERSION>-${ubi8-minimal.zulu11-ca-jdk-headless.version}</ZULU_OPENJDK_VERSION>
<PYTHON_PIP_VERSION>-${ubi8-minimal.python39-pip.version}</PYTHON_PIP_VERSION>
<PYTHON_PIP_VERSION>${ubi8-minimal.python314-pip.version}</PYTHON_PIP_VERSION>
<PYTHON_SETUPTOOLS_VERSION>==${python.setuptools.version}</PYTHON_SETUPTOOLS_VERSION>
<PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>${git-repo.confluent-docker-utils.tag}</PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>
<SKIP_SECURITY_UPDATE_CHECK>${docker.skip-security-update-check}</SKIP_SECURITY_UPDATE_CHECK>
Expand All @@ -156,7 +156,7 @@
<OPENSSL_VERSION>-${ubi8-minimal.openssl.version}</OPENSSL_VERSION>
<WGET_VERSION>-${ubi8-minimal.wget.version}</WGET_VERSION>
<NETCAT_VERSION>-${ubi8-minimal.nmap-ncat.version}</NETCAT_VERSION>
<PYTHON39_VERSION>-${ubi8-minimal.python39.version}</PYTHON39_VERSION>
<PYTHON314_VERSION>${ubi8-minimal.python314.version}</PYTHON314_VERSION>
<TAR_VERSION>-${ubi8-minimal.tar.version}</TAR_VERSION>
<PROCPS_VERSION>-${ubi8-minimal.procps-ng.version}</PROCPS_VERSION>
<KRB5_WORKSTATION_VERSION>-${ubi8-minimal.krb5-workstation.version}</KRB5_WORKSTATION_VERSION>
Expand All @@ -166,7 +166,7 @@
<GLIBC_VERSION>-${ubi8-minimal.glibc.version}</GLIBC_VERSION>
<CURL_VERSION>-${ubi8-minimal.curl.version}</CURL_VERSION>
<ZULU_OPENJDK_VERSION>-${ubi8-minimal.zulu11-ca-jdk-headless.version}</ZULU_OPENJDK_VERSION>
<PYTHON_PIP_VERSION>-${ubi8-minimal.python39-pip.version}</PYTHON_PIP_VERSION>
<PYTHON_PIP_VERSION>${ubi8-minimal.python314-pip.version}</PYTHON_PIP_VERSION>
<PYTHON_SETUPTOOLS_VERSION>==${python.setuptools.version}</PYTHON_SETUPTOOLS_VERSION>
<PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>${git-repo.confluent-docker-utils.tag}</PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>
<SKIP_SECURITY_UPDATE_CHECK>${docker.skip-security-update-check}</SKIP_SECURITY_UPDATE_CHECK>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<ubi8-minimal.openssl.version>1.1.1k-14.el8_10</ubi8-minimal.openssl.version>
<ubi8-minimal.wget.version>1.19.5-12.el8_10</ubi8-minimal.wget.version>
<ubi8-minimal.nmap-ncat.version>7.92-2.el8_10</ubi8-minimal.nmap-ncat.version>
<ubi8-minimal.python39.version>3.9.25-2.module+el8.10.0+23718+1842ae33</ubi8-minimal.python39.version>
<ubi8-minimal.python314.version>3.14.0</ubi8-minimal.python314.version>
<ubi8-minimal.tar.version>1.30-11.el8_10</ubi8-minimal.tar.version>
<ubi8-minimal.procps-ng.version>3.3.15-14.el8</ubi8-minimal.procps-ng.version>
<ubi8-minimal.krb5-workstation.version>1.18.2-32.el8_10</ubi8-minimal.krb5-workstation.version>
Expand All @@ -80,7 +80,7 @@
<ubi8-minimal.glibc.version>2.28-251.el8_10.27</ubi8-minimal.glibc.version>
<ubi8-minimal.curl.version>7.61.1-34.el8_10.9</ubi8-minimal.curl.version>
<ubi8-minimal.zulu11-ca-jdk-headless.version>11.0.30-1</ubi8-minimal.zulu11-ca-jdk-headless.version>
<ubi8-minimal.python39-pip.version>20.2.4-9.module+el8.10.0+21329+8d76b841</ubi8-minimal.python39-pip.version>
<ubi8-minimal.python314-pip.version>24.2</ubi8-minimal.python314-pip.version>

<!-- Python Package Versions -->
<python.setuptools.version>80.9.0</python.setuptools.version>
Expand Down