Skip to content

Commit 76b49ca

Browse files
committed
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 parent f998568 commit 76b49ca

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

azure-pipelines/docker/bionic

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BASE
2-
FROM $BASE
2+
FROM $BASE AS apt
33
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
4+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
55
clang \
66
cmake \
77
curl \
@@ -22,8 +22,8 @@ RUN apt-get update && \
2222
valgrind \
2323
&& \
2424
rm -rf /var/lib/apt/lists/*
25-
RUN mkdir /var/run/sshd
2625

26+
FROM apt AS mbedtls
2727
RUN cd /tmp && \
2828
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
2929
tar -xz && \
@@ -34,7 +34,9 @@ RUN cd /tmp && \
3434
cd .. && \
3535
rm -rf mbedtls-2.16.2
3636

37+
FROM mbedtls AS configure
3738
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
3839
RUN chmod a+x /usr/local/bin/entrypoint.sh
40+
RUN mkdir /var/run/sshd
3941

4042
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

azure-pipelines/docker/xenial

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ RUN apt-get update && \
2323
openssl \
2424
pkgconf \
2525
python \
26-
valgrind
26+
valgrind \
27+
&& \
28+
rm -rf /var/lib/apt/lists/*
2729

2830
FROM apt AS mbedtls
2931
RUN cd /tmp && \

0 commit comments

Comments
 (0)