2 files changed, 55 insertions, 62 deletions
diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile
index 45dbe76..384fd51 100644
--- a/docker/biboumi-test/fedora/Dockerfile
+++ b/docker/biboumi-test/fedora/Dockerfile
@@ -1,10 +1,62 @@
 # 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.louiz.org/biboumi-test-fedora-base
+FROM docker.io/fedora:latest
 
-# Install litesql
-RUN git clone git://git.louiz.org/litesql && mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 &&  cd /litesql/build && make install && ldconfig && rm -rf /litesql
+ENV LC_ALL C.UTF-8
+
+RUN dnf --refresh install -y\
+    gcc-c++\
+    clang\
+    valgrind\
+    udns-devel\
+    c-ares-devel\
+    sqlite-devel\
+    libuuid-devel\
+    libgcrypt-devel\
+    cmake\
+    make\
+    expat-devel\
+    libidn-devel\
+    uuid-devel\
+    systemd-devel\
+    pandoc\
+    libasan\
+    libubsan\
+    git\
+    fedora-packager\
+    python3-lxml\
+    lcov\
+    rpmdevtools\
+    python3-devel\
+    automake\
+    autoconf\
+    flex\
+    flex-devel\
+    bison\
+    libtool-ltdl-devel\
+    libtool\
+    openssl-devel\
+    which\
+    java-1.8.0-openjdk\
+    && dnf clean all
+
+# Install botan
+RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && ldconfig && rm -rf /botan
+
+# Install slixmpp, for e2e tests
+RUN git clone git://git.louiz.org/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
+
+RUN useradd tester
+
+# Install charybdis, for e2e tests
+RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install && rm -rf /charybdis
+
+RUN chown -R tester:tester /home/tester/ircd
+
+RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
+
+COPY coverity /home/tester/coverity
 
 WORKDIR /home/tester
 USER tester
diff --git a/docker/biboumi-test/fedora/Dockerfile.base b/docker/biboumi-test/fedora/Dockerfile.base
deleted file mode 100644
index 20984a2..0000000
--- a/docker/biboumi-test/fedora/Dockerfile.base
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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:latest
-
-ENV LC_ALL C.UTF-8
-
-RUN dnf --refresh install -y\
-    gcc-c++\
-    clang\
-    valgrind\
-    udns-devel\
-    c-ares-devel\
-    sqlite-devel\
-    libuuid-devel\
-    libgcrypt-devel\
-    cmake\
-    make\
-    expat-devel\
-    libidn-devel\
-    uuid-devel\
-    systemd-devel\
-    pandoc\
-    libasan\
-    libubsan\
-    git\
-    fedora-packager\
-    python3-lxml\
-    lcov\
-    rpmdevtools\
-    python3-devel\
-    automake\
-    autoconf\
-    flex\
-    flex-devel\
-    bison\
-    libtool-ltdl-devel\
-    libtool\
-    openssl-devel\
-    which\
-    java-1.8.0-openjdk\
-    && dnf clean all
-
-# Install botan
-RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && ldconfig && rm -rf /botan
-
-# Install slixmpp, for e2e tests
-RUN git clone git://git.louiz.org/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
-
-RUN useradd tester
-
-# Install charybdis, for e2e tests
-RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install && rm -rf /charybdis
-
-RUN chown -R tester:tester /home/tester/ircd
-
-RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
-
-COPY coverity /home/tester/coverity