diff --git a/tools/docker/Makefile b/tools/docker/Makefile index c08cca1e8f..973d610115 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -312,7 +312,7 @@ distclean: clean | export/archives ########################## ## MINIZINC CHALLENGE ## ########################## -MZN_TAG=or-tools-minizinc-challenge:2019v3 +MZN_TAG=or-tools-minizinc-challenge:2020v1 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 cf4fd21913..0c8a91afc2 100644 --- a/tools/docker/minizinc-challenge.Dockerfile +++ b/tools/docker/minizinc-challenge.Dockerfile @@ -1,10 +1,10 @@ -FROM minizinc/mznc2019:1.0 +FROM minizinc/mznc2020 ENV SRC_GIT_BRANCH master RUN apt-get update -RUN apt-get -y install pkg-config git wget autoconf libtool zlib1g-dev gawk g++ curl cmake make lsb-release python-dev gfortran +RUN apt-get -y install pkg-config git wget autoconf libtool zlib1g-dev gawk g++ curl cmake make lsb-release python-dev gfortran gcc-8 ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -15,10 +15,24 @@ RUN git clone -b "$SRC_GIT_BRANCH" --single-branch https://github.com/google/or- WORKDIR /root/or-tools +RUN make Makefile.local + +RUN echo USE_SCIP=OFF >> Makefile.local + +RUN echo USE_COINOR=OFF >> Makefile.local + +RUN mkdir ortools/gen + +RUN mkdir ortools/gen/ortools + +RUN mkdir ortools/gen/ortools/linear_solver + +RUN touch ortools/gen/ortools/linear_solver/lpi_glop.cc + RUN make -j 4 third_party -RUN make -j 4 cc fz +RUN make -j 2 cc fz RUN ln -s /root/or-tools/bin/fz /entry_data/fzn-exec -RUN cp /root/or-tools/ortools/flatzinc/mznlib_sat/*mzn /entry_data/mzn-lib \ No newline at end of file +RUN cp /root/or-tools/ortools/flatzinc/mznlib/*mzn /entry_data/mzn-lib \ No newline at end of file