Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: Install websockets from pip for all distros

Browse source 
The cluster/websocket tests were developed against websockets 14.2,
but Ubuntu and Alpine ship too old versions. Switch to installing
the latest version from pip instead, so we don't need to bother making
tests compatible with very old Python packages shipped by distributions.
This commit is contained in:
Arne Welzel 2025-01-30 11:23:46 +01:00
parent 91eb2786be
commit 9f768d1896
5 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ci/alpine/Dockerfile
View file

@ -26,10 +26,9 @@ RUN apk add --no-cache \
openssl-dev \ openssl-dev \
procps \ procps \
py3-pip \ py3-pip \
py3-websockets \
python3 \ python3 \
python3-dev \ python3-dev \
swig \ swig \
zlib-dev zlib-dev
RUN pip3 install --break-system-packages junit2html RUN pip3 install --break-system-packages websockets junit2html

3
ci/debian-12/Dockerfile
View file

@ -28,7 +28,6 @@ RUN apt-get update && apt-get -y install \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip\ python3-pip\
python3-websockets \
sqlite3 \ sqlite3 \
swig \ swig \
wget \ wget \
@ -39,4 +38,4 @@ RUN apt-get update && apt-get -y install \
# Debian bookworm really doesn't like using pip to install system wide stuff, but # Debian bookworm really doesn't like using pip to install system wide stuff, but
# doesn't seem there's a python3-junit2html package, so not sure what we'd break. # doesn't seem there's a python3-junit2html package, so not sure what we'd break.
RUN pip3 install --break-system-packages junit2html RUN pip3 install --break-system-packages websockets junit2html

3
ci/opensuse-tumbleweed/Dockerfile
View file

@ -32,7 +32,6 @@ RUN zypper refresh \
python3 \ python3 \
python3-devel \ python3-devel \
python3-pip \ python3-pip \
python3-websockets \
swig \ swig \
tar \ tar \
util-linux \ util-linux \
@ -40,4 +39,4 @@ RUN zypper refresh \
zlib-devel \ zlib-devel \
&& rm -rf /var/cache/zypp && rm -rf /var/cache/zypp
RUN pip3 install --break-system-packages junit2html RUN pip3 install --break-system-packages websockets junit2html

3
ci/ubuntu-24.04/Dockerfile
View file

@ -31,7 +31,6 @@ RUN apt-get update && apt-get -y install \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip \ python3-pip \
python3-websockets \
ruby \ ruby \
sqlite3 \ sqlite3 \
swig \ swig \
@ -43,7 +42,7 @@ RUN apt-get update && apt-get -y install \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install --break-system-packages junit2html RUN pip3 install --break-system-packages websockets junit2html
RUN gem install coveralls-lcov RUN gem install coveralls-lcov
# Download a newer pre-built ccache version that recognizes -fprofile-update=atomic # Download a newer pre-built ccache version that recognizes -fprofile-update=atomic

3
ci/ubuntu-24.10/Dockerfile
View file

@ -31,7 +31,6 @@ RUN apt-get update && apt-get -y install \
python3 \ python3 \
python3-dev \ python3-dev \
python3-pip \ python3-pip \
python3-websockets \
ruby \ ruby \
sqlite3 \ sqlite3 \
swig \ swig \
@ -43,5 +42,5 @@ RUN apt-get update && apt-get -y install \
&& apt autoclean \ && apt autoclean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN pip3 install --break-system-packages junit2html RUN pip3 install --break-system-packages websockets junit2html
RUN gem install coveralls-lcov RUN gem install coveralls-lcov