CI: Install python3.8 on older distros

This commit is contained in:
Tim Wojtulewicz 2023-08-22 14:44:20 -07:00
parent 56ec2dfeba
commit 5b5a771339
3 changed files with 13 additions and 9 deletions

View file

@ -39,9 +39,10 @@ RUN yum -y install \
make \ make \
openssl \ openssl \
openssl-devel \ openssl-devel \
python3 \ rh-python38 \
python3-devel \ rh-python38-devel \
python3-pip\ rh-python38-python-devel \
rh-python38-pip \
sqlite \ sqlite \
swig \ swig \
which \ which \
@ -59,6 +60,7 @@ RUN pip3 install websockets junit2html
RUN echo 'unset BASH_ENV PROMPT_COMMAND ENV' > /usr/bin/zeek-ci-env && \ RUN echo 'unset BASH_ENV PROMPT_COMMAND ENV' > /usr/bin/zeek-ci-env && \
echo 'source /opt/rh/devtoolset-8/enable' >> /usr/bin/zeek-ci-env && \ echo 'source /opt/rh/devtoolset-8/enable' >> /usr/bin/zeek-ci-env && \
echo 'source /opt/rh/rh-python38/enable' >> /usr/bin/zeek-ci-env && \
echo 'export PATH=${PATH}:${FLEX_DIR}/bin' >> /usr/bin/zeek-ci-env echo 'export PATH=${PATH}:${FLEX_DIR}/bin' >> /usr/bin/zeek-ci-env
ENV BASH_ENV="/usr/bin/zeek-ci-env" \ ENV BASH_ENV="/usr/bin/zeek-ci-env" \

View file

@ -21,9 +21,9 @@ RUN dnf -y install \
openssl \ openssl \
openssl-devel \ openssl-devel \
procps-ng \ procps-ng \
python3 \ python38 \
python3-devel \ python38-devel \
python3-pip\ python38-pip\
sqlite \ sqlite \
swig \ swig \
which \ which \

View file

@ -19,15 +19,17 @@ RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.4
libopenssl-devel \ libopenssl-devel \
libpcap-devel \ libpcap-devel \
make \ make \
python3 \ python39 \
python3-devel \ python39-devel \
python3-pip \ python39-pip \
swig \ swig \
tar \ tar \
which \ which \
zlib-devel \ zlib-devel \
&& rm -rf /var/cache/zypp && rm -rf /var/cache/zypp
RUN update-alternatives --install /usr/bin/pip3 pip3 /usr/bin/pip3.9 100
RUN pip3 install websockets junit2html RUN pip3 install websockets junit2html
RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-10 100 RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-10 100