diff --git a/Containerfile b/Containerfile index 9d567fc..5e96ddb 100644 --- a/Containerfile +++ b/Containerfile @@ -27,7 +27,6 @@ RUN apt-get -qq update && apt-get -qq install \ libffi-dev \ libreadline-dev \ lld \ - opam \ openfpgaloader \ pkg-config \ python3 \ @@ -47,7 +46,7 @@ RUN git clone --depth=1 --recursive --branch=0.45 https://git.libre-chip.org/mir && make install \ && rm -rf /build -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.93.0 \ +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.89.0 \ && . "$HOME/.cargo/env" \ && rustup component add rust-src ENV PATH=/root/.cargo/bin:$PATH @@ -114,16 +113,4 @@ RUN git clone --depth=1 --recursive --branch=z3-4.13.3 https://git.libre-chip.or && cd build \ && make -j"$(nproc)" \ && make install \ - && rm -rf /build - -# Install Rocq. Based on: -# https://rocq-prover.org/docs/using-opam#installing-rocq -# https://github.com/rocq-community/docker-base/blob/71a2b78f4faf9c1dc658e1c4bf920dff2257787f/base/rocq-single/Dockerfile#L87 (BSD license) -# https://gitlab.com/rocq-community/docker-rocq/-/blob/c4507ab5c137227700dac7e35fb5c0747fcd272f/rocq/stable/Dockerfile (MIT license) -# initialize an "opam switch" -RUN opam init --auto-setup --yes --disable-sandboxing -# install Rocq inside the default switch -RUN eval $(opam env) \ - && opam pin -y add rocq-prover 9.0.0 \ - && opam clean -a -r -c -s --logs -ENV PATH=/root/.opam/default/bin:$PATH + && rm -rf /build \ No newline at end of file