on 7c92436 help sign in
Dockerfile+2−1
since splitsnapshots
unifiedsplit
@@ -2,9 +2,10 @@ 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
5
6
6# NOTE: also update debian-bootstrap.sh when cuda version changes
7# NOTE: also update debian-bootstrap.sh when cuda version changes
7−ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
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
8ENV CUDA_PATH /usr/local/cuda-10.0
9ENV CUDA_PATH /usr/local/cuda-10.0
9ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
10ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
10
11
check+1−1
@@ -3,4 +3,4 @@
3# Convenience script for checking constraints locally
3# Convenience script for checking constraints locally
4
4
5cd `dirname $0`
5cd `dirname $0`
6−exec stack exec --resolver ghc-8.6.3 stackage-curator check
6+exec stack exec --resolver ghc-8.6.4 stackage-curator check
debian-bootstrap.sh+14−13
@@ -10,23 +10,29 @@
10# instructions, see:
10# instructions, see:
11# http://www.stackage.org/install
11# http://www.stackage.org/install
12
12
13−set -exu
13+set -exuo pipefail
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+
18apt-get update
27apt-get update
19apt-get install -y software-properties-common
28apt-get install -y software-properties-common
20
29
21−add-apt-repository ppa:hvr/ghc -y
22add-apt-repository -y ppa:marutter/rrutter
30add-apt-repository -y ppa:marutter/rrutter
23apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
31apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
24add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy main'
32add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy main'
25add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
33add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
26add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
34add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
27
35
28−GHCVER=8.6.3
29−
30apt-get update
36apt-get update
31apt-get install -y \
37apt-get install -y \
32 apt-transport-https \
38 apt-transport-https \
@@ -38,10 +44,6 @@ apt-get install -y \
38 fsharp \
44 fsharp \
39 g++ \
45 g++ \
40 gawk \
46 gawk \
41− ghc-$GHCVER \
42− ghc-$GHCVER-dyn \
43− ghc-$GHCVER-htmldocs \
44− ghc-$GHCVER-prof \
45 git \
47 git \
46 gnupg \
48 gnupg \
47 gradle \
49 gradle \
@@ -164,11 +166,6 @@ ACCEPT_EULA=Y apt-get install msodbcsql17 -y
164
166
165locale-gen en_US.UTF-8
167locale-gen en_US.UTF-8
166
168
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−
172# llvm-5.0 for GHC (separate since it needs wget)
169# llvm-5.0 for GHC (separate since it needs wget)
173wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
170wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
174 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
171 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
@@ -304,3 +301,7 @@ export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-3.9/include;
304# finally run:
301# finally run:
305ldconfig
302ldconfig
306# EOF: don't build anything below this line
303# EOF: don't build anything below this line
304+
305+# Cleanup
306+apt-get clean
307+rm -rf /var/lib/apt/lists/*
etc/ci-script.sh+1−1
@@ -2,7 +2,7 @@
2
2
3set -euxo pipefail
3set -euxo pipefail
4
4
5−export GHCVER=8.6.3
5+export GHCVER=8.6.4
6
6
7# Download and unpack the stack executable
7# Download and unpack the stack executable
8mkdir -p ~/.local/bin
8mkdir -p ~/.local/bin