From e7f942ae35a7ae6356beaf732775236a58f7fd01 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 4 May 2024 22:04:31 +0200 Subject: [PATCH 1/3] First Ubuntu 24.04 image for CI --- kiwix-build_ci/noble_builder.dockerfile | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 kiwix-build_ci/noble_builder.dockerfile diff --git a/kiwix-build_ci/noble_builder.dockerfile b/kiwix-build_ci/noble_builder.dockerfile new file mode 100644 index 00000000..b1217c09 --- /dev/null +++ b/kiwix-build_ci/noble_builder.dockerfile @@ -0,0 +1,39 @@ +FROM ubuntu:noble +LABEL org.opencontainers.image.source https://github.com/kiwix/container-images + +ENV LANG C.UTF-8 +ENV OS_NAME numbat +ENV DEBIAN_FRONTEND noninteractive + +RUN apt update -q \ + && apt install -q -y --no-install-recommends \ +# Base build tools + build-essential automake libtool cmake ccache pkg-config autopoint patch \ + python3-full python3-pip python3-setuptools python3-wheel git subversion \ + wget unzip ninja-build openssh-client curl libgl-dev \ +# 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 + qt6-base-dev qt6-base-dev-tools qt6-webengine-dev libqt6webenginecore6-bin libqt6svg6 \ +# To create the appimage of kiwix-desktop + libfuse3-3 fuse3 patchelf \ +# Flatpak tools + elfutils flatpak flatpak-builder \ +# Cross win32 compiler + g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \ +# Cross compile i586 + libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \ +# 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 --break-system-packages + +# Create user +RUN groupadd --gid 121 runner +RUN useradd --uid 1001 --gid 121 --create-home runner +USER runner +ENV PATH /home/runner/.local/bin:$PATH From d23b5011f05f84f4e3836224177f846d695c67ef Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 4 May 2024 22:06:15 +0200 Subject: [PATCH 2/3] Use latest version of actions/checkout --- .github/workflows/maintenance_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maintenance_ci.yml b/.github/workflows/maintenance_ci.yml index f288d77a..59942f97 100644 --- a/.github/workflows/maintenance_ci.yml +++ b/.github/workflows/maintenance_ci.yml @@ -13,7 +13,7 @@ jobs: name: Deploy Maintenance Image runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v4 - name: Publish Docker Image uses: openzim/docker-publish-action@v10 with: From 93f47d14cb2872a1c405cd23c16bb685b3d5e619 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Tue, 7 May 2024 20:24:43 +0200 Subject: [PATCH 3/3] Fix: OS_NAME --- kiwix-build_ci/noble_builder.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kiwix-build_ci/noble_builder.dockerfile b/kiwix-build_ci/noble_builder.dockerfile index b1217c09..18017734 100644 --- a/kiwix-build_ci/noble_builder.dockerfile +++ b/kiwix-build_ci/noble_builder.dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:noble LABEL org.opencontainers.image.source https://github.com/kiwix/container-images ENV LANG C.UTF-8 -ENV OS_NAME numbat +ENV OS_NAME noble ENV DEBIAN_FRONTEND noninteractive RUN apt update -q \ @@ -13,7 +13,7 @@ RUN apt update -q \ wget unzip ninja-build openssh-client curl libgl-dev \ # Packaged dependencies libbz2-dev libmagic-dev uuid-dev zlib1g-dev \ - libmicrohttpd-dev aria2 libgtest-dev libgl-dev \ + libmicrohttpd-dev aria2 libgtest-dev libgl-dev \ # Devel package to compile python modules libxml2-dev libxslt-dev python3-dev \ # Qt packages