Skip to content

Commit 8d3efd5

Browse files
upgrade redhat8 python/ansible
1 parent 120bf34 commit 8d3efd5

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

base/redhat-8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ LABEL name="splunk" \
2828
ARG BUSYBOX_URL
2929

3030
ENV BUSYBOX_URL=${BUSYBOX_URL} \
31-
PYTHON_VERSION=3.7.16 \
32-
PYTHON_GPG_KEY_ID=0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
31+
PYTHON_VERSION=3.8.19 \
32+
PYTHON_GPG_KEY_ID=E3FF2839C048B25C084DEBE9B26995E310250568
3333

3434
COPY install.sh /install.sh
3535

base/redhat-8/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip
7474

7575
# Install splunk-ansible dependencies
7676
cd /
77-
/usr/bin/python3.7 -m pip install --upgrade pip
77+
/usr/bin/python3.8 -m pip install --upgrade pip
7878
pip -q --no-cache-dir install --upgrade "requests_unixsocket<2.29" "requests<2.29" six wheel Mako "urllib3<2.0.0" certifi jmespath future avro cryptography lxml protobuf setuptools ansible
7979

8080
# Remove tests packaged in python libs

py23-image/redhat-8/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ USER root
55
RUN microdnf -y --nodocs update \
66
&& microdnf -y --nodocs install python2-pip python2-devel \
77
&& pip2 --no-cache-dir install requests pyyaml jmespath \
8-
&& ln -sf /usr/bin/python3.7 /usr/bin/python3 \
9-
&& ln -sf /usr/bin/pip3.7 /usr/bin/pip3 \
10-
&& ln -sf /usr/bin/python3.7 /usr/bin/python \
11-
&& ln -sf /usr/bin/pip3.7 /usr/bin/pip \
12-
&& pip3 install --upgrade ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
8+
&& ln -sf /usr/bin/python3.8 /usr/bin/python3 \
9+
&& ln -sf /usr/bin/pip3.8 /usr/bin/pip3 \
10+
&& ln -sf /usr/bin/python3.8 /usr/bin/python \
11+
&& ln -sf /usr/bin/pip3.8 /usr/bin/pip \
12+
&& pip3 install --upgrade requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0

0 commit comments

Comments
 (0)