diff --git a/tools/docker/Makefile b/tools/docker/Makefile index c25f07881e..a8d5eb62c5 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -307,7 +307,7 @@ distclean_python: clean_python ########################## ## MINIZINC CHALLENGE ## ########################## -MZN_TAG=or-tools-minizinc-challenge:2018v3 +MZN_TAG=or-tools-minizinc-challenge:2019v2 minizinc-challenge-image: docker build -f minizinc-challenge.Dockerfile -t $(MZN_TAG) . diff --git a/tools/docker/minizinc-challenge.Dockerfile b/tools/docker/minizinc-challenge.Dockerfile index c3cbd440f2..cf4fd21913 100644 --- a/tools/docker/minizinc-challenge.Dockerfile +++ b/tools/docker/minizinc-challenge.Dockerfile @@ -1,4 +1,4 @@ -FROM minizinc/mznc2018:1.0 +FROM minizinc/mznc2019:1.0 ENV SRC_GIT_BRANCH master @@ -15,9 +15,9 @@ RUN git clone -b "$SRC_GIT_BRANCH" --single-branch https://github.com/google/or- WORKDIR /root/or-tools -RUN make -j 8 third_party +RUN make -j 4 third_party -RUN make -j 8 cc fz +RUN make -j 4 cc fz RUN ln -s /root/or-tools/bin/fz /entry_data/fzn-exec