THRIFT-82: follow-up to common lisp to stabilize the linux build environment and update some docs
diff --git a/build/docker/README.md b/build/docker/README.md
index 28d5b16..35943e1 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -136,13 +136,13 @@
| Language | ubuntu-trusty | ubuntu-xenial | ubuntu-artful | Notes |
| :-------- | :------------ | :------------ | :------------ | :---- |
-| as of | Oct 01, 2017 | Jan 29, 2018 | Jan 29, 2018 | |
+| as of | Oct 01, 2017 | Jan 29, 2018 | Mar 02, 2018 | |
| as3 | | | | Not in CI |
| C++ gcc | 4.8.4 | 5.4.0 | 7.2.0 | |
| C++ clang | 3.4 | 3.8 | 4.0 | |
| C# (mono) | 3.2.8.0 | 4.2.1.0 | 4.6.2.7 | |
| c_glib | 2.40.2 | 2.48.2 | 2.54.0 | |
-| CL (sbcl) | | | 1.3.14 | |
+| CL (sbcl) | | | 1.4.4 | |
| cocoa | | | | Not in CI |
| d | 2.070.2 | 2.073.2 | 2.077.1 | |
| dart | 1.20.1 | 1.22.1 | 1.24.3 | |
diff --git a/build/docker/ubuntu-artful/Dockerfile b/build/docker/ubuntu-artful/Dockerfile
index b9c30f6..fe241c4 100644
--- a/build/docker/ubuntu-artful/Dockerfile
+++ b/build/docker/ubuntu-artful/Dockerfile
@@ -41,11 +41,6 @@
# RUN echo "deb http://download.mono-project.com/repo/debian xenial main" | tee /etc/apt/sources.list.d/mono.list && \
# apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A6A19B38D3D831EF
-# D
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EBCF975E5BA24D5E && \
- wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list && \
- wget -qO - https://dlang.org/d-keyring.gpg | apt-key add -
-
# Dart
RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > \
@@ -95,29 +90,30 @@
`# csharp (mono) dependencies` \
mono-devel
-ENV D_VERSION 2.077.1-0.1
-RUN apt-get install -y --no-install-recommends \
+ENV SBCL_VERSION 1.4.4
+RUN \
`# Common Lisp (sbcl) dependencies` \
- sbcl
+ curl --version && \
+ curl -O -J -L https://kent.dl.sourceforge.net/project/sbcl/sbcl/${SBCL_VERSION}/sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \
+ tar xjf sbcl-${SBCL_VERSION}-x86-64-linux-binary.tar.bz2 && \
+ cd sbcl-${SBCL_VERSION}-x86-64-linux && \
+ ./install.sh && \
+ sbcl --version && \
+ rm -rf sbcl*
-RUN apt-get install -y --no-install-recommends \
- `# D dependencies` \
- dmd-bin=$D_VERSION \
- libphobos2-dev=$D_VERSION \
- dmd-compiler=$D_VERSION \
- dmd-tools=$D_VERSION \
- dub \
- dfmt \
- dscanner \
- libevent-dev \
- libssl-dev \
- xdg-utils
-RUN mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
+ENV D_VERSION 2.077.1
+ENV DMD_DEB dmd_2.077.1-0_amd64.deb
+RUN \
+`# D dependencies` \
+ wget -q http://downloads.dlang.org/releases/2.x/${D_VERSION}/${DMD_DEB} && \
+ dpkg --install ${DMD_DEB} && \
+ rm -f ${DMD_DEB} && \
+ mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
curl -sSL https://github.com/D-Programming-Deimos/libevent/archive/master.tar.gz| tar xz && \
mv libevent-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
mv libevent-master/C/* /usr/include/dmd/druntime/import/C/ && \
- rm -rf libevent-master
-RUN curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
+ rm -rf libevent-master && \
+ curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
mv openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
mv openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
rm -rf openssl-master