363938a · stackage · git.iko.soy

git.iko.soy/stackage

on master help sign in

rebase docker image to Ubuntu 18.04

363938aJens Petersen8 years ago

Dockerfile+1−1

compare with master

unifiedsplit

@@ -1,4 +1,4 @@

1−FROM fpco/pid1:16.04

1+FROM fpco/pid1:18.04

3ENV HOME /home/stackage

4ENV LANG en_US.UTF-8

debian-bootstrap.sh+20−36

@@ -62,16 +62,16 @@ apt-get install -y \

62 libfftw3-dev \

63 libflac-dev \

64 libfreenect-dev \

65− libgd2-xpm-dev \

65+ libgd-dev \

66 libgeoip-dev \

67 libgirepository1.0-dev \

68 libglfw3-dev \

69 libglib2.0-dev \

70 libglu1-mesa-dev \

71 libgmp3-dev \

72− libgnutls-dev \

72+ libgnutls28-dev \

73 libgsasl7-dev \

74− libgsl0-dev \

74+ libgsl-dev \

75 libgtk-3-dev \

76 libgtk2.0-dev \

77 libgtksourceview-3.0-dev \

@@ -94,7 +94,7 @@ apt-get install -y \

94 libmp3lame-dev \

95 libmpfr-dev \

96 libmysqlclient-dev \

97− libncurses-dev \

97+ libncurses5-dev \

98 libnfc-dev \

99 liboath-dev \

100 libnotify-dev \

@@ -131,15 +131,13 @@ apt-get install -y \

131 libzip-dev \

132 libzstd-dev \

133 libzmq3-dev \

134− llvm-3.9 \

134+ llvm-6.0 \

135 locales \

136 m4 \

137 minisat \

138 mono-mcs \

139 nettle-dev \

140 ninja-build \

141− nodejs \

142− npm \

143 openjdk-8-jdk \

141 openjdk-8-jdk \

144 python-mpltoolkits.basemap \

142 python-mpltoolkits.basemap \

145 python3-matplotlib \

143 python3-matplotlib \

@@ -169,15 +167,9 @@ curl -sSL https://get.haskellstack.org/ | sh

169# Put documentation where we expect it

167# Put documentation where we expect it

170mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc

168mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc

171

169

172−# llvm-5.0 for GHC (separate since it needs wget)

173−wget -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" \

175− && apt-get update \

176− && apt-get install -y llvm-5.0

177−

178# llvm-7.0 for llvm-hs (separate since it needs wget)

170# llvm-7.0 for llvm-hs (separate since it needs wget)

179wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \

171wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \

180− && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" \

172+ && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" \

181 && apt-get update \

173 && apt-get update \

182 && apt-get install -y llvm-7

174 && apt-get install -y llvm-7

183

175

@@ -191,14 +183,13 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10

191# This version is tracked here:

183# This version is tracked here:

192# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing

184# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing

193#

185#

194−# GHC 8.4 requires LLVM 5.0 tools (specifically, llc-5.0 and opt-5.0).

186+# GHC 8.6 requires LLVM 6.0 tools (specifically, llc-6.0 and opt-6.0).

195−update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-5.0" 50

187+update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-6.0" 50

196−update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-5.0" 50

188+update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-6.0" 50

197

189

198−# Made sure a "node" binary is in the path, as well as "nodejs".

190+# nodejs 10 (nodejs8 in bionic needs conflicting libssl10-dev)

199−# A historical naming collision on Debian means that the binary is called "nodejs",

191+curl -sL https://deb.nodesource.com/setup_10.x | bash -

200−# but some tools like tsc still expect "node" to exist.

192+apt-get install -y nodejs

201−ln -s /usr/bin/nodejs /usr/bin/node

202

193

203# install ocilib dependencies then build and install ocilib

194# install ocilib dependencies then build and install ocilib

204cd /tmp \

195cd /tmp \

@@ -229,9 +220,9 @@ echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf

229

220

230# Install erlang/otp platform and its dependencies

221# Install erlang/otp platform and its dependencies

231ERLANG_VERSION="20.2.2"

222ERLANG_VERSION="20.2.2"

232−ERLANG_DEB_FILE="esl-erlang_${ERLANG_VERSION}-1~debian~jessie_amd64.deb"

223+ERLANG_DEB_FILE="esl-erlang_21.2-1~ubuntu~bionic_amd64.deb"

233pushd /tmp \

224pushd /tmp \

234− && wget https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/${ERLANG_DEB_FILE} \

225+ && wget http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_general/${ERLANG_DEB_FILE}

235 && (dpkg -i ${ERLANG_DEB_FILE}; apt-get install -yf) \

226 && (dpkg -i ${ERLANG_DEB_FILE}; apt-get install -yf) \

236 && rm ${ERLANG_DEB_FILE} \

227 && rm ${ERLANG_DEB_FILE} \

237 && popd

228 && popd

@@ -274,12 +265,12 @@ CUDA_VER=10.0

274CUDA_APT=10-0

265CUDA_APT=10-0

275

266

276pushd /tmp \

267pushd /tmp \

277− && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \

268+ && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \

278− && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub \

269+ && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub \

279− && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \

270+ && dpkg -i cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \

280 && apt-get update -qq \

271 && apt-get update -qq \

281 && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \

272 && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \

282− && rm cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \

273+ && rm cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \

283 && export CUDA_PATH=/usr/local/cuda-${CUDA_VER} \

274 && export CUDA_PATH=/usr/local/cuda-${CUDA_VER} \

284 && export LD_LIBRARY_PATH=${CUDA_PATH}/nvvm/lib64:${LD_LIBRARY_PATH+x} \

275 && export LD_LIBRARY_PATH=${CUDA_PATH}/nvvm/lib64:${LD_LIBRARY_PATH+x} \

285 && export LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH} \

276 && export LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH} \

@@ -291,15 +282,8 @@ apt-add-repository multiverse \

291 && apt-get update \

282 && apt-get update \

292 && apt-get install -y nvidia-cuda-dev

283 && apt-get install -y nvidia-cuda-dev

293

284

294−# newer gcc version for yoga

295−add-apt-repository ppa:ubuntu-toolchain-r/test \

296− && apt-get update \

297− && apt-get install gcc-7 \

298− && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7

299−

300−export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-3.9/lib;

285+export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-6.0/lib;

301−export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-3.9/include;

286+export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-6.0/include;

302−

303

287

304# finally run:

288# finally run:

305ldconfig

289ldconfig