diff --git a/tools/docker/images/alpine-edge.Dockerfile b/tools/docker/images/alpine-edge.Dockerfile index dbb46015b3..9fed9c59d0 100644 --- a/tools/docker/images/alpine-edge.Dockerfile +++ b/tools/docker/images/alpine-edge.Dockerfile @@ -70,7 +70,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ -&& [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] +&& [ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ] WORKDIR /root/or-tools # C++ diff --git a/tools/docker/images/debian-10.Dockerfile b/tools/docker/images/debian-10.Dockerfile index 8bd4baa8af..4c1f392ae4 100644 --- a/tools/docker/images/debian-10.Dockerfile +++ b/tools/docker/images/debian-10.Dockerfile @@ -70,6 +70,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # Download sources # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed +SHELL ["/bin/bash", "-c"] RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] WORKDIR /root/or-tools diff --git a/tools/docker/images/debian-11.Dockerfile b/tools/docker/images/debian-11.Dockerfile index fa4ba2811c..a06b3ac947 100644 --- a/tools/docker/images/debian-11.Dockerfile +++ b/tools/docker/images/debian-11.Dockerfile @@ -70,6 +70,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # Download sources # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed +SHELL ["/bin/bash", "-c"] RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] WORKDIR /root/or-tools diff --git a/tools/docker/images/debian-sid.Dockerfile b/tools/docker/images/debian-sid.Dockerfile index b926b8ae85..c6264d6ad1 100644 --- a/tools/docker/images/debian-sid.Dockerfile +++ b/tools/docker/images/debian-sid.Dockerfile @@ -67,6 +67,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # Download sources # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed +SHELL ["/bin/bash", "-c"] RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] WORKDIR /root/or-tools diff --git a/tools/docker/images/ubuntu-18.04.Dockerfile b/tools/docker/images/ubuntu-18.04.Dockerfile index dba92c8de1..4f9ede60cf 100644 --- a/tools/docker/images/ubuntu-18.04.Dockerfile +++ b/tools/docker/images/ubuntu-18.04.Dockerfile @@ -82,6 +82,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # Download sources # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed +SHELL ["/bin/bash", "-c"] RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] WORKDIR /root/or-tools diff --git a/tools/docker/images/ubuntu-20.04.Dockerfile b/tools/docker/images/ubuntu-20.04.Dockerfile index 024aa2b8c3..b56209a101 100644 --- a/tools/docker/images/ubuntu-20.04.Dockerfile +++ b/tools/docker/images/ubuntu-20.04.Dockerfile @@ -75,6 +75,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # Download sources # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed +SHELL ["/bin/bash", "-c"] RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] WORKDIR /root/or-tools diff --git a/tools/docker/images/ubuntu-22.04.Dockerfile b/tools/docker/images/ubuntu-22.04.Dockerfile index f6c9b5c323..0b2bbdb911 100644 --- a/tools/docker/images/ubuntu-22.04.Dockerfile +++ b/tools/docker/images/ubuntu-22.04.Dockerfile @@ -66,6 +66,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # Download sources # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed +SHELL ["/bin/bash", "-c"] RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] WORKDIR /root/or-tools diff --git a/tools/docker/images/ubuntu-22.10.Dockerfile b/tools/docker/images/ubuntu-22.10.Dockerfile index 5c812a8d35..1ab7c6dc1e 100644 --- a/tools/docker/images/ubuntu-22.10.Dockerfile +++ b/tools/docker/images/ubuntu-22.10.Dockerfile @@ -66,6 +66,7 @@ ENV OR_TOOLS_PATCH ${OR_TOOLS_PATCH:-9999} # Download sources # use SRC_GIT_SHA1 to modify the command # i.e. avoid docker reusing the cache when new commit is pushed +SHELL ["/bin/bash", "-c"] RUN git clone -b "${SRC_GIT_BRANCH}" --single-branch --depth=1 https://github.com/google/or-tools \ && [[ $(cd or-tools && git rev-parse --verify HEAD) == ${SRC_GIT_SHA1} ]] WORKDIR /root/or-tools diff --git a/tools/docker/python/arm64v8/manylinux.Dockerfile b/tools/docker/python/arm64v8/manylinux.Dockerfile index 13842aa918..1b6092688c 100644 --- a/tools/docker/python/arm64v8/manylinux.Dockerfile +++ b/tools/docker/python/arm64v8/manylinux.Dockerfile @@ -37,7 +37,7 @@ RUN curl --location-trusted \ && tar xvf swig-4.0.2.tar.gz \ && rm swig-4.0.2.tar.gz \ && cd swig-4.0.2 \ -&& ./configure --prefix=/usr \ +&& ./configure --prefix=/usr/local \ && make -j 4 \ && make install \ && cd .. \