diff --git a/base/redhat-8/Dockerfile b/base/redhat-8/Dockerfile index 2226cf25..165b0d00 100644 --- a/base/redhat-8/Dockerfile +++ b/base/redhat-8/Dockerfile @@ -25,8 +25,8 @@ LABEL name="splunk" \ summary="UBI 8 Docker image of Splunk Enterprise" \ description="Splunk Enterprise is a platform for operational intelligence. Our software lets you collect, analyze, and act upon the untapped value of big data that your technology infrastructure, security systems, and business applications generate. It gives you insights to drive operational performance and business results." -ENV PYTHON_VERSION=3.9.19 \ - PYTHON_GPG_KEY_ID=E3FF2839C048B25C084DEBE9B26995E310250568 +ENV PYTHON_VERSION=3.13.12 \ + PYTHON_GPG_KEY_ID=A821E680E5FA6305 COPY install.sh /install.sh diff --git a/base/redhat-8/install.sh b/base/redhat-8/install.sh index 133597a4..e64926a9 100755 --- a/base/redhat-8/install.sh +++ b/base/redhat-8/install.sh @@ -66,9 +66,9 @@ ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip3 # Install splunk-ansible dependencies cd / -/usr/bin/python3.9 -m pip install --upgrade pip -pip -q --no-cache-dir install --upgrade requests_unixsocket requests six wheel Mako "urllib3<2.0.0" certifi jmespath future avro cryptography lxml protobuf setuptools ansible -rm -rf /usr/lib/python3.9/site-packages/ansible_collections/netbox/ +/usr/bin/python3 -m pip install --upgrade pip +pip -q --no-cache-dir install --upgrade requests_unixsocket requests six wheel Mako urllib3 certifi jmespath future avro cryptography lxml protobuf setuptools ansible +rm -rf /usr/lib/python3.13/site-packages/ansible_collections/grafana/ # Remove tests packaged in python libs find /usr/lib/ -depth \( -type d -a -not -wholename '*/ansible/plugins/test' -a \( -name test -o -name tests -o -name idle_test \) \) -exec rm -rf '{}' \; diff --git a/base/redhat-9/Dockerfile b/base/redhat-9/Dockerfile index bfa55528..37e8d5c5 100644 --- a/base/redhat-9/Dockerfile +++ b/base/redhat-9/Dockerfile @@ -28,8 +28,8 @@ LABEL name="splunk" \ ARG BUSYBOX_URL ENV BUSYBOX_URL=${BUSYBOX_URL} \ - PYTHON_VERSION=3.9.19 \ - PYTHON_GPG_KEY_ID=E3FF2839C048B25C084DEBE9B26995E310250568 + PYTHON_VERSION=3.13.12 \ + PYTHON_GPG_KEY_ID=A821E680E5FA6305 COPY install.sh /install.sh diff --git a/base/redhat-9/install.sh b/base/redhat-9/install.sh index 7485d590..3b4e5812 100755 --- a/base/redhat-9/install.sh +++ b/base/redhat-9/install.sh @@ -64,9 +64,9 @@ ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip3 # Install splunk-ansible dependencies cd / -/usr/bin/python3.9 -m pip install --upgrade pip +/usr/bin/python3 -m pip install --upgrade pip pip -q --no-cache-dir install --upgrade requests_unixsocket requests six wheel Mako urllib3 certifi jmespath future avro cryptography lxml protobuf setuptools ansible -rm -rf /usr/lib/python3.9/site-packages/ansible_collections/netbox/ +rm -rf /usr/lib/python3.13/site-packages/ansible_collections/grafana/ # Remove tests packaged in python libs find /usr/lib/ -depth \( -type d -a -not -wholename '*/ansible/plugins/test' -a \( -name test -o -name tests -o -name idle_test \) \) -exec rm -rf '{}' \;