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

fix minizinc challenge tools

Browse Source
This commit is contained in:
Laurent Perron
2022-06-21 08:47:22 +02:00
parent 2f3962ee69
commit d148e77d7c
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/docker/Makefile
View File

@@ -704,9 +704,9 @@ minizinc-challenge: minizinc-challenge.Dockerfile
.PHONY: minizinc-challenge-test
minizinc-challenge-test: minizinc-challenge
${DOCKER_RUN_CMD} ${MZN_TAG} "solver -v /minizinc/test.mzn /minizinc/2.dzn"
${DOCKER_RUN_CMD} ${MZN_TAG} "solver -v --free-search /minizinc/test.mzn /minizinc/2.dzn"
${DOCKER_RUN_CMD} ${MZN_TAG} "solver -v -p 2 /minizinc/test.mzn /minizinc/2.dzn"
${DOCKER_RUN_CMD} ${MZN_TAG} solver -v /minizinc/test.mzn /minizinc/2.dzn
${DOCKER_RUN_CMD} ${MZN_TAG} solver -v --free-search /minizinc/test.mzn /minizinc/2.dzn
${DOCKER_RUN_CMD} ${MZN_TAG} solver -v -p 2 /minizinc/test.mzn /minizinc/2.dzn
.PHONY: minizinc-challenge-bash
minizinc-challenge-bash:

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

@@ -17,8 +17,6 @@ RUN apt update -qq \
&& apt clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV CC=gcc-11 CXX=g++-11
ENTRYPOINT ["/bin/bash", "-c"]
CMD ["/bin/bash"]
# Install CMake 3.21.1
RUN wget -q "https://cmake.org/files/v3.21/cmake-3.21.1-linux-x86_64.sh" \