tools/docker: Fix dockerfile
This commit is contained in:
@@ -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++
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 .. \
|
||||
|
||||
Reference in New Issue
Block a user