Skip to content

Commit eee04d9

Browse files
committed
THRIFT-3665 Add D libevent and OpenSSL to docker images
This closes apache#892
1 parent 4d28b60 commit eee04d9

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

build/docker/debian/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,19 @@ RUN apt-get update && apt-get install -y \
143143
mono-xbuild
144144

145145
# D dependencies
146-
RUN apt-get update && apt-get install -y \
147-
gcc-multilib \
148-
xdg-utils \
149-
&& curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
146+
RUN apt-get update && apt-get install -y --no-install-recommends xdg-utils && \
147+
curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
150148
dpkg -i /tmp/dmd_2.070.0-0_amd64.deb && \
151-
rm /tmp/dmd_2.070.0-0_amd64.deb
149+
rm /tmp/dmd_2.070.0-0_amd64.deb && \
150+
curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
151+
curl -sSL https://github.com/D-Programming-Deimos/libevent/archive/master.tar.gz| tar xz && \
152+
mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
153+
mv libevent-master/deimos/* openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
154+
mv libevent-master/C/* openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
155+
rm -rf libevent-master openssl-master && \
156+
echo 'gcc -Wl,--no-as-needed $*' > /usr/local/bin/gcc-dmd && \
157+
chmod 755 /usr/local/bin/gcc-dmd && \
158+
echo 'CC=/usr/local/bin/gcc-dmd' >> /etc/dmd.conf
152159

153160
# Dart dependencies
154161
RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \

build/docker/ubuntu/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,19 @@ RUN apt-get update && apt-get install -y \
151151
mono-xbuild
152152

153153
# D dependencies
154-
RUN apt-get update && apt-get install -y \
155-
gcc-multilib \
156-
xdg-utils \
157-
&& curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
154+
RUN apt-get update && apt-get install -y --no-install-recommends xdg-utils && \
155+
curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
158156
dpkg -i /tmp/dmd_2.070.0-0_amd64.deb && \
159-
rm /tmp/dmd_2.070.0-0_amd64.deb
157+
rm /tmp/dmd_2.070.0-0_amd64.deb && \
158+
curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
159+
curl -sSL https://github.com/D-Programming-Deimos/libevent/archive/master.tar.gz| tar xz && \
160+
mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
161+
mv libevent-master/deimos/* openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
162+
mv libevent-master/C/* openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
163+
rm -rf libevent-master openssl-master && \
164+
echo 'gcc -Wl,--no-as-needed $*' > /usr/local/bin/gcc-dmd && \
165+
chmod 755 /usr/local/bin/gcc-dmd && \
166+
echo 'CC=/usr/local/bin/gcc-dmd' >> /etc/dmd.conf
160167

161168
# Dart dependencies
162169
RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \

0 commit comments

Comments
 (0)