From fa4f5313df826fef63a52d05a48c9f5bc017f9bd Mon Sep 17 00:00:00 2001 From: Balazs Komuves Date: Tue, 28 Nov 2023 16:45:12 +0100 Subject: [PATCH] minor improvements in the Dockerfile --- base-image/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) mode change 100755 => 100644 base-image/Dockerfile diff --git a/base-image/Dockerfile b/base-image/Dockerfile old mode 100755 new mode 100644 index f29f76e..ec4ea17 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -4,7 +4,7 @@ SHELL ["/bin/bash", "--rcfile", "/root/.bashrc", "-lc"] # === install some basic tools and libs === RUN apt-get -y update && \ - apt-get -y install curl wget vim less build-essential git \ + apt-get -y install curl wget vim less build-essential git \ libgmp-dev zlib1g zlib1g-dev pkg-config libffi-dev \ libdigest-sha3-perl @@ -85,12 +85,10 @@ RUN cd /tmp && \ BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh ./install_ghcup && \ source /root/.ghcup/env && \ echo -e "\nsource /root/.ghcup/env" >>$HOME/.bashrc && \ - ghcup --version >/zk/versions/ghcup.txt + ghcup --version >/zk/versions/ghcup.txt && \ + rm /tmp/install_ghcup RUN source /root/.ghcup/env && \ - ghc --version >/zk/versions/ghc.txt && \ - cabal --version >/zk/versions/cabal.txt && \ - rm /tmp/install_ghcup && \ ghcup upgrade && \ ghcup install cabal 2.4.1.0 && \ ghcup set cabal 2.4.1.0 && \