From 51a4dde840263a5728ab0c1eb3c922a034689055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dupressoir?= Date: Fri, 21 Nov 2025 15:34:26 +0000 Subject: [PATCH 1/2] fix dockerfiles --- scripts/docker/Dockerfile.base | 4 ++-- scripts/docker/Dockerfile.test | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/docker/Dockerfile.base b/scripts/docker/Dockerfile.base index b8aff9ce11..1a43903b01 100644 --- a/scripts/docker/Dockerfile.base +++ b/scripts/docker/Dockerfile.base @@ -2,11 +2,11 @@ FROM debian:stable -MAINTAINER Pierre-Yves Strub +LABEL org.opencontainers.image.maintainer="Pierre-Yves Strub " ARG user=charlie -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN \ apt-get -q -y update && \ diff --git a/scripts/docker/Dockerfile.test b/scripts/docker/Dockerfile.test index f8dcd165da..2e9522d3aa 100644 --- a/scripts/docker/Dockerfile.test +++ b/scripts/docker/Dockerfile.test @@ -5,7 +5,6 @@ FROM ./Dockerfile.build ARG EC_VERSION=main RUN \ - opam pin --dev-repo \ - add -n easycrypt https://github.com/EasyCrypt/easycrypt.git#${EC_VERSION} && \ + opam pin add -n easycrypt https://github.com/EasyCrypt/easycrypt.git#${EC_VERSION} && \ opam install -v easycrypt && \ rm -rf .opam/packages.dev/* From 18f10b551cfb51b381f1a4716cd793aa50efee40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dupressoir?= Date: Fri, 21 Nov 2025 15:34:42 +0000 Subject: [PATCH 2/2] add a formosa dockerfile --- scripts/docker/Dockerfile.formosa | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 scripts/docker/Dockerfile.formosa diff --git a/scripts/docker/Dockerfile.formosa b/scripts/docker/Dockerfile.formosa new file mode 100644 index 0000000000..8ff3767340 --- /dev/null +++ b/scripts/docker/Dockerfile.formosa @@ -0,0 +1,7 @@ +# syntax = devthefuture/dockerfile-x + +FROM ./Dockerfile.build as build-formosa + +RUN \ + opam install --deps-only --confirm-level=unsafe-yes jasmin && \ + opam clean