Update to ergo 2.15+

docker/test/alpine/Dockerfile

@@ -1,13 +1,17 @@
 # This Dockerfile creates a docker image suitable to run biboumi’s build and
 # tests.  For example, it can be used on with gitlab-ci.
 
-FROM alpine:latest
+FROM docker.io/alpine:edge
 
 ENV LC_ALL C.UTF-8
 
+# py3-slixmpp is in testing repo
+RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+
 # Needed to build biboumi
 RUN apk add --no-cache \
 git \
+ergo \
 make \
 cmake \
 g++ \
@@ -24,6 +28,7 @@ catch2-3 \
 valgrind \
 py3-pip \
 py3-lxml \
+py3-slixmpp \
 python3-dev \
 libffi-dev \
 go \
@@ -31,8 +36,3 @@ rust \
 cargo \
 wget
 
-# Install oragono, for e2e tests
-RUN wget "https://github.com/ergochat/ergo/archive/v2.0.0.tar.gz" && tar xvf "v2.0.0.tar.gz" && cd "ergo-2.0.0" && make && cp ~/go/bin/oragono /usr/local/bin/oragono
-
-# Install slixmpp, for e2e tests
-RUN pip3 install slixmpp --break-system-packages

docker/test/debian/Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile creates a docker image suitable to run biboumi’s build and
 # tests.  For example, it can be used on with gitlab-ci.
 
-FROM debian:bookworm
+FROM docker.io/debian:trixie
 
 ENV LC_ALL=C.UTF-8
 
@@ -23,10 +23,10 @@ libgcrypt20-dev \
 libpq-dev \
 libcatch2-dev \
 valgrind \
-libasan6 \
+libasan8 \
 libubsan1 \
 python3-lxml \
 python3-slixmpp \
+ergochat \
 wget
 
-RUN wget "https://github.com/ergochat/ergo/releases/download/v2.0.0/oragono-2.0.0-linux-x64.tar.gz" && tar xvf oragono-2.0.0-linux-x64.tar.gz && cp oragono-2.0.0-linux-x64/oragono /usr/local/bin

docker/test/fedora/Dockerfile

@@ -1,8 +1,9 @@
 # This Dockerfile creates a docker image suitable to run biboumi’s build and
 # tests.  For example, it can be used on with gitlab-ci.
 
-FROM fedora:latest
+FROM docker.io/fedora:latest
 
+ARG ERGO_VERSION=2.16.0
 ENV LC_ALL=C.UTF-8
 
 # TODO: upgrade to botan3
@@ -39,5 +40,5 @@ rpmdevtools \
 # Install slixmpp, for e2e tests
 RUN pip3 install --break-system-packages slixmpp
 
-# Install oragono, for e2e tests
-RUN wget "https://github.com/ergochat/ergo/releases/download/v2.0.0/oragono-2.0.0-linux-x64.tar.gz" && tar xvf oragono-2.0.0-linux-x64.tar.gz && cp oragono-2.0.0-linux-x64/oragono /usr/local/bin
+# Install ergo, for e2e tests
+RUN wget "https://github.com/ergochat/ergo/releases/download/v${ERGO_VERSION}/ergo-${ERGO_VERSION}-linux-x86_64.tar.gz" && tar xvf ergo-${ERGO_VERSION}-linux-x86_64.tar.gz && cp -r ergo-${ERGO_VERSION}-linux-x86_64 /usr/local/lib/ergo && ln -s /usr/local/lib/ergo/ergo /usr/local/bin/ergo