Skip to content

Commit 86d4c54

Browse files
committed
tools/docker: Fix alpine build
1 parent fddabae commit 86d4c54

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

tools/docker/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ $(python_targets_export): python_amd64_%_export: python_amd64_%_build | export
209209
${DOCKER_RUN_CMD} \
210210
-v `pwd`/export:/export \
211211
-it ${IMAGE}:python_amd64_$*_build \
212-
"cp build_*/python/dist/*.whl /export/python"
212+
"cp build*/python/dist/*.whl /export/python"
213213

214214
## ARM64v8
215215
PYTHON_ARM_DISTROS = $(addprefix arm64v8_, $(PYTHON_DISTROS))
@@ -265,7 +265,7 @@ $(python_arm_targets_export): python_arm64v8_%_export: python_arm64v8_%_build |
265265
${DOCKER_RUN_CMD} \
266266
-v `pwd`/export:/export \
267267
-it ${IMAGE}:python_arm64v8_$*_build \
268-
"cp build_*/python/dist/*.whl /export/python"
268+
"cp build*/python/dist/*.whl /export/python"
269269

270270
## MERGE ##
271271
.PHONY: python

tools/docker/python/amd64/alpine.Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ WORKDIR /root/or-tools
4040
RUN cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON -DBUILD_PYTHON=ON
4141
RUN cmake --build build -v -j8
4242
# Rename wheel package ortools-version+musl-....
43-
RUN cp build/python/dist//ortools-*.whl .
43+
RUN cp build/python/dist/ortools-*.whl .
4444
RUN NAME=$(ls *.whl | sed -e "s/\(ortools-[0-9\.]\+\)/\1+musl/") && mv *.whl "${NAME}"
45+
RUN rm build/python/dist/ortools-*.whl
46+
RUN mv *.whl build/python/dist/
4547

4648
FROM build AS test
4749
RUN cmake --build build --target test

tools/docker/python/arm64v8/alpine.Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ WORKDIR /root/or-tools
3939
RUN cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON -DBUILD_PYTHON=ON
4040
RUN cmake --build build -v -j8
4141
# Rename wheel package ortools-version+musl-....
42-
RUN cp build/python/dist//ortools-*.whl .
42+
RUN cp build/python/dist/ortools-*.whl .
4343
RUN NAME=$(ls *.whl | sed -e "s/\(ortools-[0-9\.]\+\)/\1+musl/") && mv *.whl "${NAME}"
44+
RUN rm build/python/dist/ortools-*.whl
45+
RUN mv *.whl build/python/dist/
4446

4547
FROM build AS test
4648
RUN cmake --build build --target test

0 commit comments

Comments
 (0)