tools/docker: Fix alpine build
This commit is contained in:
@@ -209,7 +209,7 @@ $(python_targets_export): python_amd64_%_export: python_amd64_%_build | export
|
||||
${DOCKER_RUN_CMD} \
|
||||
-v `pwd`/export:/export \
|
||||
-it ${IMAGE}:python_amd64_$*_build \
|
||||
"cp build_*/python/dist/*.whl /export/python"
|
||||
"cp build*/python/dist/*.whl /export/python"
|
||||
|
||||
## ARM64v8
|
||||
PYTHON_ARM_DISTROS = $(addprefix arm64v8_, $(PYTHON_DISTROS))
|
||||
@@ -265,7 +265,7 @@ $(python_arm_targets_export): python_arm64v8_%_export: python_arm64v8_%_build |
|
||||
${DOCKER_RUN_CMD} \
|
||||
-v `pwd`/export:/export \
|
||||
-it ${IMAGE}:python_arm64v8_$*_build \
|
||||
"cp build_*/python/dist/*.whl /export/python"
|
||||
"cp build*/python/dist/*.whl /export/python"
|
||||
|
||||
## MERGE ##
|
||||
.PHONY: python
|
||||
|
||||
@@ -40,8 +40,10 @@ WORKDIR /root/or-tools
|
||||
RUN cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON -DBUILD_PYTHON=ON
|
||||
RUN cmake --build build -v -j8
|
||||
# Rename wheel package ortools-version+musl-....
|
||||
RUN cp build/python/dist//ortools-*.whl .
|
||||
RUN cp build/python/dist/ortools-*.whl .
|
||||
RUN NAME=$(ls *.whl | sed -e "s/\(ortools-[0-9\.]\+\)/\1+musl/") && mv *.whl "${NAME}"
|
||||
RUN rm build/python/dist/ortools-*.whl
|
||||
RUN mv *.whl build/python/dist/
|
||||
|
||||
FROM build AS test
|
||||
RUN cmake --build build --target test
|
||||
|
||||
@@ -39,8 +39,10 @@ WORKDIR /root/or-tools
|
||||
RUN cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON -DBUILD_PYTHON=ON
|
||||
RUN cmake --build build -v -j8
|
||||
# Rename wheel package ortools-version+musl-....
|
||||
RUN cp build/python/dist//ortools-*.whl .
|
||||
RUN cp build/python/dist/ortools-*.whl .
|
||||
RUN NAME=$(ls *.whl | sed -e "s/\(ortools-[0-9\.]\+\)/\1+musl/") && mv *.whl "${NAME}"
|
||||
RUN rm build/python/dist/ortools-*.whl
|
||||
RUN mv *.whl build/python/dist/
|
||||
|
||||
FROM build AS test
|
||||
RUN cmake --build build --target test
|
||||
|
||||
Reference in New Issue
Block a user