Skip to content

Commit 253dbea

Browse files
committed
docker: install mbedTLS on both Bionic and Xenial
We're about to phase out support for Trusty, but neither Bionic nor Xenial images provide the mbedTLS library that's available in Trusty. Build them for both to pull them in line with Trusty.
1 parent bbc0b20 commit 253dbea

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

azure-pipelines/docker/bionic

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,15 @@ RUN apt-get update
55
RUN apt-get -y install pkgconf clang git cmake curl libssl-dev libcurl4 libcurl4-openssl-dev libssh2-1-dev libz-dev valgrind openssh-client openssh-server
66
RUN if [ "$ARCH" != "armhf" -a "$ARCH" != "arm64" ]; then apt-get -y install openjdk-11-jre-headless; fi
77
RUN mkdir /var/run/sshd
8+
9+
RUN cd /tmp && \
10+
curl -LO https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz && \
11+
tar -xf mbedtls-2.16.2-apache.tgz && \
12+
rm -f mbedtls-2.16.2-apache.tgz && \
13+
cd mbedtls-2.16.2 && \
14+
scripts/config.pl set MBEDTLS_MD4_C 1 && \
15+
CFLAGS=-fPIC cmake -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \
16+
cmake --build . && \
17+
make install && \
18+
cd .. && \
19+
rm -rf mbedtls-2.16.2

azure-pipelines/docker/xenial

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,15 @@ ARG CACHEBUST=1
44
RUN apt-get update
55
RUN apt-get -y install pkgconf clang git cmake curl libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev valgrind openssh-client openssh-server openjdk-8-jre
66
RUN mkdir /var/run/sshd
7+
8+
RUN cd /tmp && \
9+
curl -LO https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz && \
10+
tar -xf mbedtls-2.16.2-apache.tgz && \
11+
rm -f mbedtls-2.16.2-apache.tgz && \
12+
cd mbedtls-2.16.2 && \
13+
scripts/config.pl set MBEDTLS_MD4_C 1 && \
14+
CFLAGS=-fPIC cmake -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON . && \
15+
cmake --build . && \
16+
make install && \
17+
cd .. && \
18+
rm -rf mbedtls-2.16.2

0 commit comments

Comments
 (0)