From 86d4c543f717fa8716a9d66c25143660668bf825 Mon Sep 17 00:00:00 2001
From: Mizux Seiha <mizux.dev@gmail.com>
Date: Fri, 1 Oct 2021 05:13:58 +0200
Subject: [PATCH] tools/docker: Fix alpine build

---
 tools/docker/Makefile                         | 4 ++--
 tools/docker/python/amd64/alpine.Dockerfile   | 4 +++-
 tools/docker/python/arm64v8/alpine.Dockerfile | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index e5a0347d185..4b296f7f2eb 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -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
diff --git a/tools/docker/python/amd64/alpine.Dockerfile b/tools/docker/python/amd64/alpine.Dockerfile
index a3cf1fb1844..74eb00a1eba 100644
--- a/tools/docker/python/amd64/alpine.Dockerfile
+++ b/tools/docker/python/amd64/alpine.Dockerfile
@@ -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
diff --git a/tools/docker/python/arm64v8/alpine.Dockerfile b/tools/docker/python/arm64v8/alpine.Dockerfile
index 79039016f87..f419c6a0ec4 100644
--- a/tools/docker/python/arm64v8/alpine.Dockerfile
+++ b/tools/docker/python/arm64v8/alpine.Dockerfile
@@ -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