From 9f768d1896925d1feb749e43d98cec49d7110aac Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Thu, 30 Jan 2025 11:23:46 +0100
Subject: [PATCH] ci: Install websockets from pip for all distros

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.
---
 ci/alpine/Dockerfile              | 3 +--
 ci/debian-12/Dockerfile           | 3 +--
 ci/opensuse-tumbleweed/Dockerfile | 3 +--
 ci/ubuntu-24.04/Dockerfile        | 3 +--
 ci/ubuntu-24.10/Dockerfile        | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ci/alpine/Dockerfile b/ci/alpine/Dockerfile
index 7bb6e67901..ea9a163ea5 100644
--- a/ci/alpine/Dockerfile
+++ b/ci/alpine/Dockerfile
@@ -26,10 +26,9 @@ RUN apk add --no-cache \
   openssl-dev \
   procps \
   py3-pip \
-  py3-websockets \
   python3 \
   python3-dev \
   swig \
   zlib-dev
 
-RUN pip3 install --break-system-packages junit2html
+RUN pip3 install --break-system-packages websockets junit2html
diff --git a/ci/debian-12/Dockerfile b/ci/debian-12/Dockerfile
index cc94969f48..bc66a7d39e 100644
--- a/ci/debian-12/Dockerfile
+++ b/ci/debian-12/Dockerfile
@@ -28,7 +28,6 @@ RUN apt-get update && apt-get -y install \
     python3 \
     python3-dev \
     python3-pip\
-    python3-websockets \
     sqlite3 \
     swig \
     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
 # 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
diff --git a/ci/opensuse-tumbleweed/Dockerfile b/ci/opensuse-tumbleweed/Dockerfile
index 27191b665d..bbc33a47a1 100644
--- a/ci/opensuse-tumbleweed/Dockerfile
+++ b/ci/opensuse-tumbleweed/Dockerfile
@@ -32,7 +32,6 @@ RUN zypper refresh \
     python3 \
     python3-devel \
     python3-pip \
-    python3-websockets \
     swig \
     tar \
     util-linux \
@@ -40,4 +39,4 @@ RUN zypper refresh \
     zlib-devel \
   && rm -rf /var/cache/zypp
 
-RUN pip3 install --break-system-packages junit2html
+RUN pip3 install --break-system-packages websockets junit2html
diff --git a/ci/ubuntu-24.04/Dockerfile b/ci/ubuntu-24.04/Dockerfile
index 7b13638c30..85f0e36d7f 100644
--- a/ci/ubuntu-24.04/Dockerfile
+++ b/ci/ubuntu-24.04/Dockerfile
@@ -31,7 +31,6 @@ RUN apt-get update && apt-get -y install \
     python3 \
     python3-dev \
     python3-pip \
-    python3-websockets \
     ruby \
     sqlite3 \
     swig \
@@ -43,7 +42,7 @@ RUN apt-get update && apt-get -y install \
   && apt autoclean \
   && 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
 
 # Download a newer pre-built ccache version that recognizes -fprofile-update=atomic
diff --git a/ci/ubuntu-24.10/Dockerfile b/ci/ubuntu-24.10/Dockerfile
index a937c7b3e7..52fb682c10 100644
--- a/ci/ubuntu-24.10/Dockerfile
+++ b/ci/ubuntu-24.10/Dockerfile
@@ -31,7 +31,6 @@ RUN apt-get update && apt-get -y install \
     python3 \
     python3-dev \
     python3-pip \
-    python3-websockets \
     ruby \
     sqlite3 \
     swig \
@@ -43,5 +42,5 @@ RUN apt-get update && apt-get -y install \
   && apt autoclean \
   && 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