From 64f1b1b9ececef1867f935b9a5ff80737904e220 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Fri, 18 Apr 2025 00:16:48 +0200
Subject: [PATCH] ci: update dockerfiles

oragono got renamed, and distros have been updated in the last decade
---
 docker/biboumi/alpine/Dockerfile |  2 +-
 docker/test/alpine/Dockerfile    |  8 +++++---
 docker/test/debian/Dockerfile    | 21 +++++++--------------
 docker/test/fedora/Dockerfile    |  6 +++---
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/docker/biboumi/alpine/Dockerfile b/docker/biboumi/alpine/Dockerfile
index 67be80f..48d5fbc 100644
--- a/docker/biboumi/alpine/Dockerfile
+++ b/docker/biboumi/alpine/Dockerfile
@@ -33,7 +33,7 @@ RUN apk add --no-cache libidn libpq libstdc++ libuuid postgresql-libs \
 COPY --from=builder /etc/biboumi /etc/biboumi
 COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi
 
-COPY ./biboumi.cfg /etc/biboumi/biboumi.cfg
+COPY ./docker/biboumi/alpine/biboumi.cfg /etc/biboumi/biboumi.cfg
 
 RUN adduser biboumi -D -h /home/biboumi && \
     mkdir /var/lib/biboumi && \
diff --git a/docker/test/alpine/Dockerfile b/docker/test/alpine/Dockerfile
index 60f7499..ac1ecb1 100644
--- a/docker/test/alpine/Dockerfile
+++ b/docker/test/alpine/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 docker.io/alpine:latest
+FROM alpine:latest
 
 ENV LC_ALL C.UTF-8
 
@@ -26,10 +26,12 @@ py3-lxml \
 python3-dev \
 libffi-dev \
 go \
+rust \
+cargo \
 wget
 
 # Install oragono, for e2e tests
-RUN wget "https://github.com/oragono/oragono/archive/v2.0.0.tar.gz" && tar xvf "v2.0.0.tar.gz" && cd "oragono-2.0.0" && make && cp ~/go/bin/oragono /usr/local/bin
+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 git clone https://github.com/saghul/aiodns.git && cd aiodns && git checkout 7ee13f9bea25784322~ && python3 setup.py build && python3 setup.py install && git clone https://lab.louiz.org/poezio/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
+RUN pip3 install slixmpp --break-system-packages
diff --git a/docker/test/debian/Dockerfile b/docker/test/debian/Dockerfile
index d1254c5..98e8dd8 100644
--- a/docker/test/debian/Dockerfile
+++ b/docker/test/debian/Dockerfile
@@ -1,18 +1,16 @@
 # 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 docker.io/debian:buster
+FROM debian:bookworm
 
-ENV LC_ALL C.UTF-8
+ENV LC_ALL=C.UTF-8
 
-RUN apt update
-
-# Needed to build biboumi
-RUN apt install -y --no-install-recommends \
+RUN apt update && apt install -y --no-install-recommends \
 git \
 make \
 cmake \
 g++ \
+ca-certificates \
 libuuid1 \
 libudns-dev \
 libexpat1-dev \
@@ -24,15 +22,10 @@ uuid-dev \
 libgcrypt20-dev \
 libpq-dev \
 valgrind \
-libasan5 \
-libubsan0 \
-python3-pip \
+libasan6 \
+libubsan1 \
 python3-lxml \
-python3-dev \
+python3-slixmpp \
 wget
 
 RUN wget "https://github.com/oragono/oragono/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 slixmpp, for e2e tests
-RUN git clone https://github.com/saghul/aiodns.git && cd aiodns && git checkout 7ee13f9bea25784322~ && python3 setup.py build && python3 setup.py install && git clone https://lab.louiz.org/poezio/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
-
diff --git a/docker/test/fedora/Dockerfile b/docker/test/fedora/Dockerfile
index cd41741..237af15 100644
--- a/docker/test/fedora/Dockerfile
+++ b/docker/test/fedora/Dockerfile
@@ -1,9 +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 docker.io/fedora:32
+FROM fedora:latest
 
-ENV LC_ALL C.UTF-8
+ENV LC_ALL=C.UTF-8
 
 RUN dnf --refresh install -y \
 git \
@@ -35,7 +35,7 @@ rpmdevtools \
 && dnf clean all
 
 # Install slixmpp, for e2e tests
-RUN git clone https://lab.louiz.org/poezio/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
+RUN pip3 install --break-system-packages slixmpp
 
 # Install oragono, for e2e tests
 RUN wget "https://github.com/oragono/oragono/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