From 743e228699cb4a37992a6893af5fedb80b89f6f4 Mon Sep 17 00:00:00 2001 From: David Gidwani Date: Thu, 10 Oct 2024 17:31:33 -0400 Subject: [PATCH] feat: :sparkles: update manylinux for 3.13 support --- .github/workflows/build.yml | 8 ++++---- .mise.toml | 3 +++ Dockerfile | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .mise.toml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35d0340..ef89eeb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,20 +41,20 @@ jobs: packages: write steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4.2.1 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3.7.1 - name: Set up emulation if: matrix.platform != 'i686' && matrix.platform != 'x86_64' - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3.2.0 with: platforms: ${{ matrix.platform }} - name: Setup cache if: github.event_name != 'workflow_dispatch' || fromJSON(github.event.inputs.useCache) - uses: actions/cache@v3 + uses: actions/cache@v4.1.1 with: path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/* key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}-${{ hashFiles('Dockerfile') }} diff --git a/.mise.toml b/.mise.toml new file mode 100644 index 0000000..62216d1 --- /dev/null +++ b/.mise.toml @@ -0,0 +1,3 @@ +[tools] +python = "3.13.0" +hadolint = "latest" diff --git a/Dockerfile b/Dockerfile index 4ee7cc0..b581bc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG POLICY=manylinux2014 ARG PLATFORM=x86_64 -ARG TAG=2024-01-08-eb135ed +ARG TAG=2024-10-07-1887322 ARG DEVTOOLSET_ROOTPATH=/opt/rh/gcc-toolset-12/root ARG LD_LIBRARY_PATH_ARG=${DEVTOOLSET_ROOTPATH}/usr/lib64:${DEVTOOLSET_ROOTPATH}/usr/lib:${DEVTOOLSET_ROOTPATH}/usr/lib64/dyninst:${DEVTOOLSET_ROOTPATH}/usr/lib/dyninst @@ -26,7 +26,7 @@ RUN wget -qO- https://www.colm.net/files/ragel/ragel-${ragel_version}.tar.gz | t WORKDIR /tmp/ragel-${ragel_version} RUN ./configure --prefix=/usr && make -j$(nproc) && make install -FROM base_ragel as base_vectorscan +FROM base_ragel AS base_vectorscan ARG boost_version ARG hyperscan_git_source ARG hyperscan_git_tag @@ -35,7 +35,7 @@ RUN git clone -b ${hyperscan_git_tag} ${hyperscan_git_source} RUN wget -qO- http://downloads.sourceforge.net/project/boost/boost/${boost_version}/boost_$(echo "${boost_version}" | tr . _).tar.bz2 | tar xj RUN mv boost*/boost vectorscan/include -FROM base_vectorscan as build_pcre +FROM base_vectorscan AS build_pcre ARG pcre_version ENV CFLAGS="-fPIC" WORKDIR /tmp/vectorscan @@ -72,7 +72,7 @@ RUN make -j$(nproc) && make install FROM base LABEL maintainer="David Gidwani " -LABEL org.opencontainers.image.description Python manylinux with Intel Vectorscan +LABEL org.opencontainers.image.description Python manylinux with Vectorscan ARG LD_LIBRARY_PATH_ARG ARG PREPEND_PATH ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH_ARG}