git.iko.soy/stackage
on master help sign in
Revert "Install GHC via Stack"
cea8e2cMichael Snoyman
Dockerfile+1−2
compare with master
unifiedsplit
@@ -2,10 +2,9 @@ FROM fpco/pid1:16.04
2
2
3ENV HOME /home/stackage
3ENV HOME /home/stackage
4ENV LANG en_US.UTF-8
4ENV LANG en_US.UTF-8
5−ENV GHCVER 8.6.4
6
5
7# NOTE: also update debian-bootstrap.sh when cuda version changes
6# NOTE: also update debian-bootstrap.sh when cuda version changes
8−ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
7+ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
9ENV CUDA_PATH /usr/local/cuda-10.0
8ENV CUDA_PATH /usr/local/cuda-10.0
10ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
9ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
11
10
debian-bootstrap.sh+6−14
@@ -10,20 +10,11 @@
10# instructions, see:
10# instructions, see:
11# http://www.stackage.org/install
11# http://www.stackage.org/install
12
12
13−set -exuo pipefail
13+set -exu
14
14
15mkdir /home/stackage -p
15mkdir /home/stackage -p
16
16
17export DEBIAN_FRONTEND=noninteractive
17export DEBIAN_FRONTEND=noninteractive
18−
19−# Get curl
20−apt-get update
21−apt-get install -y curl
22−
23−# Get Stack and GHC
24−curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
25−stack setup --resolver ghc-$GHCVER
26−
27apt-get update
18apt-get update
28apt-get install -y software-properties-common
19apt-get install -y software-properties-common
29
20
@@ -173,6 +164,11 @@ ACCEPT_EULA=Y apt-get install msodbcsql17 -y
173
164
174locale-gen en_US.UTF-8
165locale-gen en_US.UTF-8
175
166
167+curl -sSL https://get.haskellstack.org/ | sh
168+
169+# Put documentation where we expect it
170+mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
171+
176# llvm-5.0 for GHC (separate since it needs wget)
172# llvm-5.0 for GHC (separate since it needs wget)
177wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
173wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
178 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
174 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
@@ -308,7 +304,3 @@ export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-3.9/include;
308# finally run:
304# finally run:
309ldconfig
305ldconfig
310# EOF: don't build anything below this line
306# EOF: don't build anything below this line
311−
312−# Cleanup
313−apt-get clean
314−rm -rf /var/lib/apt/lists/*