Skip to content

GitLab

C
ci-images
Commit b0d0aad9 authored by Ryan Scott's avatar Ryan Scott
Browse files
Options

aarch64-linux-deb9, armv7-linux-deb9: s/gz/xz/

parent 504127ee
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
aarch64-linux-deb9/Dockerfile
View file @ b0d0aad9
...@@ -54,7 +54,7 @@ ENV CABAL_VERSION 3.0.0.0 ...@@ -54,7 +54,7 @@ ENV CABAL_VERSION 3.0.0.0
#WORKDIR /Cabal/cabal-install #WORKDIR /Cabal/cabal-install
#RUN EXTRA_CONFIGURE_OPTS=--disable-optimization ./bootstrap.sh --global --no-doc #RUN EXTRA_CONFIGURE_OPTS=--disable-optimization ./bootstrap.sh --global --no-doc
#RUN ls /Cabal/cabal-install/dist/build #RUN ls /Cabal/cabal-install/dist/build
RUN curl http://home.smart-cactus.org/~ben/ghc/cabal-install-$CABAL_VERSION-aarch64-debian9-linux.tar.gz | tar -Jx && \ RUN curl http://home.smart-cactus.org/~ben/ghc/cabal-install-$CABAL_VERSION-aarch64-debian9-linux.tar.xz | tar -Jx && \
mv cabal /usr/local/bin/cabal mv cabal /usr/local/bin/cabal
ENV PATH /home/ghc/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH ENV PATH /home/ghc/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
......
armv7-linux-deb9/Dockerfile
View file @ b0d0aad9
...@@ -55,7 +55,7 @@ ENV CABAL_VERSION 3.0.0.0 ...@@ -55,7 +55,7 @@ ENV CABAL_VERSION 3.0.0.0
#WORKDIR /Cabal/cabal-install #WORKDIR /Cabal/cabal-install
#RUN EXTRA_CONFIGURE_OPTS=--disable-optimization ./bootstrap.sh --global --no-doc #RUN EXTRA_CONFIGURE_OPTS=--disable-optimization ./bootstrap.sh --global --no-doc
#RUN ls /Cabal/cabal-install/dist/build #RUN ls /Cabal/cabal-install/dist/build
RUN curl http://home.smart-cactus.org/~ben/ghc/cabal-install-$CABAL_VERSION-armv7l-debian9-linux.tar.gz | tar -Jx && \ RUN curl http://home.smart-cactus.org/~ben/ghc/cabal-install-$CABAL_VERSION-armv7l-debian9-linux.tar.xz | tar -Jx && \
mv cabal /usr/local/bin/cabal mv cabal /usr/local/bin/cabal
ENV PATH /home/ghc/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH ENV PATH /home/ghc/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment