Commit 76b49caf6a208e44d19c84caa6d42389f0de6194
2020-02-18T15:20:08
azure: docker: synchronize Xenial/Bionic build instructions Our two Docker build instructions for Xenial and Bionic have diverged a bit. Let's re-synchronize them with each other to make them as similar as possible.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/azure-pipelines/docker/bionic b/azure-pipelines/docker/bionic
index 648bda7..179134f 100644
--- a/azure-pipelines/docker/bionic
+++ b/azure-pipelines/docker/bionic
@@ -1,7 +1,7 @@
ARG BASE
-FROM $BASE
+FROM $BASE AS apt
RUN apt-get update && \
- apt-get install -y --no-install-recommends \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
clang \
cmake \
curl \
@@ -22,8 +22,8 @@ RUN apt-get update && \
valgrind \
&& \
rm -rf /var/lib/apt/lists/*
-RUN mkdir /var/run/sshd
+FROM apt AS mbedtls
RUN cd /tmp && \
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
tar -xz && \
@@ -34,7 +34,9 @@ RUN cd /tmp && \
cd .. && \
rm -rf mbedtls-2.16.2
+FROM mbedtls AS configure
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod a+x /usr/local/bin/entrypoint.sh
+RUN mkdir /var/run/sshd
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/azure-pipelines/docker/xenial b/azure-pipelines/docker/xenial
index cb5d491..bf68b5e 100644
--- a/azure-pipelines/docker/xenial
+++ b/azure-pipelines/docker/xenial
@@ -23,7 +23,9 @@ RUN apt-get update && \
openssl \
pkgconf \
python \
- valgrind
+ valgrind \
+ && \
+ rm -rf /var/lib/apt/lists/*
FROM apt AS mbedtls
RUN cd /tmp && \