Skip to content

Commit 8ce802c

Browse files
committed
chore: use uname to get arch, use deb10 ghc
Signed-off-by: Chris Gianelloni <[email protected]>
1 parent 23e6853 commit 8ce802c

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ ARG NODE_VERSION=1.34.1
66
WORKDIR /code
77

88
# system dependencies
9+
ENV DEBIAN_FRONTEND=noninteractive
910
RUN apt-get update -y && \
11+
apt-get install -y dpkg && \
1012
apt-get install -y \
1113
automake \
1214
build-essential \
@@ -30,18 +32,18 @@ RUN apt-get update -y && \
3032
# cabal
3133
ENV CABAL_VERSION=${CABAL_VERSION}
3234
ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:/root/.local/bin:$PATH"
33-
RUN wget https://downloads.haskell.org/~cabal/cabal-install-${CABAL_VERSION}/cabal-install-${CABAL_VERSION}-x86_64-linux-deb10.tar.xz \
34-
&& tar -xf cabal-install-${CABAL_VERSION}-x86_64-linux-deb10.tar.xz \
35-
&& rm cabal-install-${CABAL_VERSION}-x86_64-linux-deb10.tar.xz \
35+
RUN wget https://downloads.haskell.org/~cabal/cabal-install-${CABAL_VERSION}/cabal-install-${CABAL_VERSION}-$(uname -m)-linux-deb10.tar.xz \
36+
&& tar -xf cabal-install-${CABAL_VERSION}-$(uname -m)-linux-deb10.tar.xz \
37+
&& rm cabal-install-${CABAL_VERSION}-$(uname -m)-linux-deb10.tar.xz \
3638
&& mkdir -p ~/.local/bin \
3739
&& mv cabal ~/.local/bin/ \
3840
&& cabal update && cabal --version
3941

4042
# GHC
4143
ENV GHC_VERSION=${GHC_VERSION}
42-
RUN wget https://downloads.haskell.org/ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-x86_64-deb9-linux.tar.xz \
43-
&& tar -xf ghc-${GHC_VERSION}-x86_64-deb9-linux.tar.xz \
44-
&& rm ghc-${GHC_VERSION}-x86_64-deb9-linux.tar.xz \
44+
RUN wget https://downloads.haskell.org/~ghc/${GHC_VERSION}/ghc-${GHC_VERSION}-$(uname -m)-deb10-linux.tar.xz \
45+
&& tar -xf ghc-${GHC_VERSION}-$(uname -m)-deb10-linux.tar.xz \
46+
&& rm ghc-${GHC_VERSION}-$(uname -m)-deb10-linux.tar.xz \
4547
&& cd ghc-${GHC_VERSION} \
4648
&& ./configure \
4749
&& make install

0 commit comments

Comments
 (0)