THRIFT-4308: re-enable dlang deimos build support for libevent
and openssl, working around a dmd link order issue.
Update dotnet-sdk to 2.1.4 (was 2.0.5) because of build failures
Client: d
Client: netcore
This closes #1483
diff --git a/build/docker/ubuntu-artful/Dockerfile b/build/docker/ubuntu-artful/Dockerfile
index bbc829c..4babc3f 100644
--- a/build/docker/ubuntu-artful/Dockerfile
+++ b/build/docker/ubuntu-artful/Dockerfile
@@ -92,27 +92,28 @@
`# csharp (mono) dependencies` \
mono-devel
+ENV D_VERSION 2.077.1-0.1
RUN apt-get install -y --no-install-recommends \
`# D dependencies` \
- dmd-bin \
- libphobos2-dev \
+ 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
-# libevent deimos doesn't seem to work so not enabling it:
-# RUN 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
-# openssl deimos doesn't work with openssl-1.0.2 so not enabling it:
-# RUN 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
+RUN 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 && \
+ mv openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
+ mv openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
+ rm -rf openssl-master
RUN apt-get install -y --no-install-recommends \
`# Dart dependencies` \
@@ -121,7 +122,7 @@
RUN apt-get install -y --no-install-recommends \
`# dotnet core dependencies` \
- dotnet-sdk-2.0.3
+ dotnet-sdk-2.1.4
RUN apt-get install -y --no-install-recommends \
`# Erlang dependencies` \