always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update minizinc docker

Browse Source
This commit is contained in:
Laurent Perron
2019-07-26 21:58:30 -07:00
parent 5461e88f1b
commit eff25e7251
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker/Makefile
View File

@@ -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) .

6
tools/docker/minizinc-challenge.Dockerfile
View File

@@ -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