diff --git a/packages/pyvips/Dockerfile b/packages/pyvips/Dockerfile.stage1 similarity index 56% rename from packages/pyvips/Dockerfile rename to packages/pyvips/Dockerfile.stage1 index 58c3183..442f5ec 100644 --- a/packages/pyvips/Dockerfile +++ b/packages/pyvips/Dockerfile.stage1 @@ -1,7 +1,5 @@ FROM ghcr.io/bjia56/armv7l-wheel-builder:main ARG PYTHON_VERSION -ARG VERSION -ARG OUTPUT_DIR WORKDIR / RUN select_python ${PYTHON_VERSION} @@ -16,13 +14,3 @@ RUN wget -q https://github.com/libvips/libvips/releases/download/v8.15.2/vips-8. meson compile && \ meson install -ENV CFLAGS='-I/tmp/vendor/include' -ENV LDFLAGS='-L/tmp/vendor/lib' -ENV LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH -ENV PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig - -COPY . /repo -RUN /repo/armv7l_build_wheels.sh ${PYTHON_VERSION} ${VERSION} - -RUN mkdir -p ${OUTPUT_DIR} && \ - cp build${PYTHON_VERSION}/wheelhouse/pyvips*manylinux*armv7l.whl ${OUTPUT_DIR} diff --git a/packages/pyvips/Dockerfile.stage2 b/packages/pyvips/Dockerfile.stage2 new file mode 100644 index 0000000..132d2a8 --- /dev/null +++ b/packages/pyvips/Dockerfile.stage2 @@ -0,0 +1,15 @@ +FROM ghcr.io/bjia56/armv7l-wheel-builder:main +ARG PYTHON_VERSION +ARG VERSION +ARG OUTPUT_DIR + +ENV CFLAGS='-I/tmp/vendor/include' +ENV LDFLAGS='-L/tmp/vendor/lib' +ENV LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH +ENV PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig + +COPY . /repo +RUN /repo/armv7l_build_wheels.sh ${PYTHON_VERSION} ${VERSION} + +RUN mkdir -p ${OUTPUT_DIR} && \ + cp build${PYTHON_VERSION}/wheelhouse/pyvips*manylinux*armv7l.whl ${OUTPUT_DIR} diff --git a/packages/pyvips/build.yaml b/packages/pyvips/build.yaml index ed0ae9d..7ec2296 100644 --- a/packages/pyvips/build.yaml +++ b/packages/pyvips/build.yaml @@ -1,6 +1,8 @@ strategy: dockerfile source: -- ./Dockerfile + - file: ./Dockerfile.stage1 + common: true + - file: ./Dockerfile.stage2 python: versions: