Skip to content

Commit

Permalink
Merge pull request #261 from kiwix/no_bionic_kiwix_ci
Browse files Browse the repository at this point in the history
[kiwix-build] Switch from bionic to manylinux image
  • Loading branch information
kelson42 authored Jun 3, 2024
2 parents f13b27d + 2de8023 commit 79dc9f0
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/kiwix-build_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
variant: [f35, focal, bionic, alpine, noble]
variant: [f35, focal, manylinux, alpine, noble]
runs-on: ubuntu-22.04

steps:
Expand Down
27 changes: 0 additions & 27 deletions kiwix-build_ci/bionic_builder.dockerfile

This file was deleted.

28 changes: 28 additions & 0 deletions kiwix-build_ci/manylinux_builder.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM quay.io/pypa/manylinux_2_28_x86_64
LABEL org.opencontainers.image.source https://github.com/kiwix/container-images

ENV LANG C.UTF-8
ENV OS_NAME manylinux

RUN dnf install -y --nodocs \
# Base build tools
make automake libtool cmake git-core subversion pkg-config gcc-c++ \
wget unzip ninja-build which patch xz openssh-clients \
# Other tools (to remove)
vim less grep \
&& dnf remove -y "*-doc" \
&& dnf autoremove -y \
&& dnf clean all \
&& python3.12 -m pip install meson pytest requests distro

ENV PATH /opt/_internal/cpython-3.12.3/bin:$PATH

# Create user
RUN groupadd --gid 121 runner
RUN useradd --uid 1001 --gid 121 --create-home runner
USER runner
WORKDIR /home/runner

RUN mkdir -p /home/runner/.local/bin
RUN ln -s /usr/local/bin/python3.12 /home/runner/.local/bin/python
ENV PATH /home/runner/.local/bin:$PATH

0 comments on commit 79dc9f0

Please sign in to comment.