Merge branch 'v99bugfix' of github.com:google/or-tools into v99bugfix

google · Jan 21, 2025 · 5085bc5 · 5085bc5
2 parents 054289a + f338a5b
commit 5085bc5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/tools/docker/python/amd64/manylinux.Dockerfile b/tools/docker/python/amd64/manylinux.Dockerfile
@@ -37,13 +37,14 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "$GIT_URL" /project \
 && git reset --hard "${GIT_SHA1}"
 WORKDIR /project
 
+# Copy build script and setup env
+ENV PLATFORM x86_64
+ARG PYTHON_VERSION
+ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 COPY build-manylinux.sh .
 RUN chmod a+x "build-manylinux.sh"
 
 FROM devel AS build
-ENV PLATFORM x86_64
-ARG PYTHON_VERSION
-ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 RUN ./build-manylinux.sh build
 
 FROM build as test

diff --git a/tools/docker/python/amd64/musllinux.Dockerfile b/tools/docker/python/amd64/musllinux.Dockerfile
@@ -32,13 +32,14 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "$GIT_URL" /project \
 && git reset --hard "${GIT_SHA1}"
 WORKDIR /project
 
+# Copy build script and setup env
+ENV PLATFORM x86_64
+ARG PYTHON_VERSION
+ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 COPY build-musllinux.sh .
 RUN chmod a+x "build-musllinux.sh"
 
 FROM devel AS build
-ENV PLATFORM x86_64
-ARG PYTHON_VERSION
-ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 RUN ./build-musllinux.sh build
 
 FROM build as test

diff --git a/tools/docker/python/arm64/manylinux.Dockerfile b/tools/docker/python/arm64/manylinux.Dockerfile
@@ -39,13 +39,14 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "$GIT_URL" /project \
 && git reset --hard "${GIT_SHA1}"
 WORKDIR /project
 
+# Copy build script and setup env
+ENV PLATFORM aarch64
+ARG PYTHON_VERSION
+ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 COPY build-manylinux.sh .
 RUN chmod a+x "build-manylinux.sh"
 
 FROM devel AS build
-ENV PLATFORM aarch64
-ARG PYTHON_VERSION
-ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 RUN ./build-manylinux.sh build
 
 FROM build as test

diff --git a/tools/docker/python/arm64/musllinux.Dockerfile b/tools/docker/python/arm64/musllinux.Dockerfile
@@ -32,13 +32,14 @@ RUN git clone -b "${GIT_BRANCH}" --single-branch "${GIT_URL}" /project \
 && git reset --hard "${GIT_SHA1}"
 WORKDIR /project
 
+# Copy build script and setup env
+ENV PLATFORM aarch64
+ARG PYTHON_VERSION
+ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 COPY build-musllinux.sh .
 RUN chmod a+x "build-musllinux.sh"
 
 FROM devel AS build
-ENV PLATFORM aarch64
-ARG PYTHON_VERSION
-ENV PYTHON_VERSION ${PYTHON_VERSION:-3}
 RUN ./build-musllinux.sh build
 
 FROM build as test