From 5955e4bea84288467f3c3dbacde1225a62d1d723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dupressoir?= Date: Fri, 15 May 2026 17:15:20 +0100 Subject: [PATCH] [docker] use binary alt-ergo builds This speeds up the build box build job. --- scripts/docker/Dockerfile.build | 29 ++++++---------------------- scripts/docker/docker-parts/alt-ergo | 3 --- 2 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 scripts/docker/docker-parts/alt-ergo diff --git a/scripts/docker/Dockerfile.build b/scripts/docker/Dockerfile.build index b7ea758111..fd9de4aabb 100644 --- a/scripts/docker/Dockerfile.build +++ b/scripts/docker/Dockerfile.build @@ -11,36 +11,19 @@ RUN \ opam install --deps-only --confirm-level=unsafe-yes easycrypt && \ opam clean -COPY --chmod=0755 --chown=1001:0 docker-parts/alt-ergo bin/run-alt-ergo - ENV PATH="/home/charlie/bin:$PATH" RUN \ version=2.6.3 && \ - opam switch create --no-switch alt-ergo-${version} ocaml-system && \ - opam pin --switch=alt-ergo-${version} add -n alt-ergo ${version} && \ - opam install --switch=alt-ergo-${version} --deps-only --confirm-level=unsafe-yes alt-ergo && \ - opam install --switch=alt-ergo-${version} alt-ergo && \ - opam clean --switch=alt-ergo-${version} && \ - ln -s run-alt-ergo ~/bin/alt-ergo-${version} + wget -O alt-ergo https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-v${version}-x86_64-linux-musl && \ + sudo install -m 0755 alt-ergo /usr/local/bin/alt-ergo-${version} && \ + rm -f alt-ergo RUN \ version=2.5.4 && \ - opam switch create --no-switch alt-ergo-${version} ocaml-system && \ - opam pin --switch=alt-ergo-${version} add -n alt-ergo ${version} && \ - opam install --switch=alt-ergo-${version} --deps-only --confirm-level=unsafe-yes alt-ergo && \ - opam install --switch=alt-ergo-${version} alt-ergo && \ - opam clean --switch=alt-ergo-${version} && \ - ln -s run-alt-ergo ~/bin/alt-ergo-${version} - -RUN \ - version=2.4.3 && \ - opam switch create --no-switch alt-ergo-${version} ocaml-system && \ - opam pin --switch=alt-ergo-${version} add -n alt-ergo ${version} && \ - opam install --switch=alt-ergo-${version} --deps-only --confirm-level=unsafe-yes alt-ergo && \ - opam install --switch=alt-ergo-${version} alt-ergo && \ - opam clean --switch=alt-ergo-${version} && \ - ln -s run-alt-ergo ~/bin/alt-ergo-${version} + wget -O alt-ergo https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-v${version}-x86_64-linux-musl && \ + sudo install -m 0755 alt-ergo /usr/local/bin/alt-ergo-${version} && \ + rm -f alt-ergo FROM base-build as main-linux-amd64 diff --git a/scripts/docker/docker-parts/alt-ergo b/scripts/docker/docker-parts/alt-ergo deleted file mode 100644 index ba1e5a551e..0000000000 --- a/scripts/docker/docker-parts/alt-ergo +++ /dev/null @@ -1,3 +0,0 @@ -# /bin/bash - -exec opam exec --switch="$(basename $0)" alt-ergo -- "$@"