From c55a96678e12514130c9fa496d34a890987f5927 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 19 Apr 2023 15:33:11 +0200
Subject: [PATCH] Build a minimalist bionic builder.

Reuse the bionic builder (we should have remove in pr #588) and
remove all deps not needed to build libzim.
---
 ci_images/bionic_builder.dockerfile | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/ci_images/bionic_builder.dockerfile b/ci_images/bionic_builder.dockerfile
index 4f09f2e..7aaf64e 100644
--- a/ci_images/bionic_builder.dockerfile
+++ b/ci_images/bionic_builder.dockerfile
@@ -4,42 +4,21 @@ ENV LANG C.UTF-8
 ENV OS_NAME bionic
 
 RUN apt update -q \
-  && dpkg --add-architecture i386 \
-  && apt install -q -y --no-install-recommends software-properties-common \
-  && add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic \
   && apt-get update \
   && apt install -q -y --no-install-recommends \
 # Base build tools
     build-essential automake libtool cmake ccache pkg-config autopoint patch \
     python3-pip python3-setuptools python3-wheel git subversion wget unzip \
-    ninja-build openssh-client curl libgl-dev \
-# Python (2) is needed to install android-ndk
-    python \
+    ninja-build openssh-client curl \
 # Packaged dependencies
-    libbz2-dev libmagic-dev uuid-dev zlib1g-dev \
-    libmicrohttpd-dev aria2 libgtest-dev libgl-dev \
-# Devel package to compile python modules
-    libxml2-dev libxslt-dev python3-dev \
-# Qt packages
-    qt515base qt515webengine qt515svg qt515imageformats qt515wayland \
-# To create the appimage of kiwix-desktop
-    libfuse2 fuse patchelf \
-# Flatpak tools
-    elfutils flatpak flatpak-builder \
-# Cross compile i586
-    libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \
+    libbz2-dev uuid-dev zlib1g-dev \
+    libgtest-dev \
 # Other tools (to remove)
 #    vim less grep \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
   && pip3 install meson pytest gcovr requests distro
 
-# Set qt515 environment (the equivalent of "source /opt/qt515/bin/qt515-env.sh")
-# RUN echo "source /opt/qt515/bin/qt515-env.sh" >> /home/runner/.bashrc
-ENV PATH=/opt/qt515/bin:$PATH \
-    LD_LIBRARY_PATH=/opt/qt515/lib/x86_64-linux-gnu:/opt/qt515/lib:$LD_LIBRARY_PATH \
-    PKG_CONFIG_PATH=/opt/qt515/lib/pkgconfig:$PKG_CONFIG_PATH
-
 # Create user
 RUN groupadd --gid 121 runner
 RUN useradd --uid 1001 --gid 121 --create-home runner