diff --git a/ortools/flatzinc/challenge/Makefile b/ortools/flatzinc/challenge/Makefile index 3dae17137d..de38f0d3e6 100644 --- a/ortools/flatzinc/challenge/Makefile +++ b/ortools/flatzinc/challenge/Makefile @@ -18,7 +18,7 @@ DOCKER_BUILD_CMD := docker build endif DOCKER_RUN_CMD := docker run --rm --init -MZN_SUFFIX=2024v5 +MZN_SUFFIX=2025v1 DOCKER_NAME=cp-sat-minizinc-challenge MZN_TAG=${DOCKER_NAME}:${MZN_SUFFIX} MZN_LS_TAG=${DOCKER_NAME}-ls:${MZN_SUFFIX} diff --git a/ortools/flatzinc/challenge/minizinc-challenge-ls.Dockerfile b/ortools/flatzinc/challenge/minizinc-challenge-ls.Dockerfile index 81db76a0ed..86b9c8034c 100644 --- a/ortools/flatzinc/challenge/minizinc-challenge-ls.Dockerfile +++ b/ortools/flatzinc/challenge/minizinc-challenge-ls.Dockerfile @@ -1,4 +1,4 @@ -FROM minizinc/mznc2024:latest AS env +FROM minizinc/mznc2025:latest AS env ENV SRC_GIT_BRANCH v99bugfix @@ -29,4 +29,6 @@ RUN ln -s /root/or-tools/bazel-bin/ortools/flatzinc/fz /entry_data/fzn-exec RUN cp /root/or-tools/ortools/flatzinc/mznlib/*mzn /entry_data/mzn-lib # Patch the run scripts -RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true -G/g" /minizinc/mzn-exec-* \ No newline at end of file +RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true -p 1 -G/g" /minizinc/mzn-exec-fd +RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true,num_workers:3 -G/g" /minizinc/mzn-exec-free +RUN sed -i -e "s/-G/--fzn-flags --params=use_ls_only:true -G/g" /minizinc/mzn-exec-par \ No newline at end of file diff --git a/ortools/flatzinc/challenge/minizinc-challenge.Dockerfile b/ortools/flatzinc/challenge/minizinc-challenge.Dockerfile index d111f1e5f8..1113ff8778 100644 --- a/ortools/flatzinc/challenge/minizinc-challenge.Dockerfile +++ b/ortools/flatzinc/challenge/minizinc-challenge.Dockerfile @@ -1,4 +1,4 @@ -FROM minizinc/mznc2024:latest AS env +FROM minizinc/mznc2025:latest AS env ENV SRC_GIT_BRANCH v99bugfix