Commit 76b49caf by Patrick Steinhardt

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.
parent f9985688
ARG BASE ARG BASE
FROM $BASE FROM $BASE AS apt
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
clang \ clang \
cmake \ cmake \
curl \ curl \
...@@ -22,8 +22,8 @@ RUN apt-get update && \ ...@@ -22,8 +22,8 @@ RUN apt-get update && \
valgrind \ valgrind \
&& \ && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN mkdir /var/run/sshd
FROM apt AS mbedtls
RUN cd /tmp && \ RUN cd /tmp && \
curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \ curl --location --silent https://tls.mbed.org/download/mbedtls-2.16.2-apache.tgz | \
tar -xz && \ tar -xz && \
...@@ -34,7 +34,9 @@ RUN cd /tmp && \ ...@@ -34,7 +34,9 @@ RUN cd /tmp && \
cd .. && \ cd .. && \
rm -rf mbedtls-2.16.2 rm -rf mbedtls-2.16.2
FROM mbedtls AS configure
COPY entrypoint.sh /usr/local/bin/entrypoint.sh COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod a+x /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"] ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
...@@ -23,7 +23,9 @@ RUN apt-get update && \ ...@@ -23,7 +23,9 @@ RUN apt-get update && \
openssl \ openssl \
pkgconf \ pkgconf \
python \ python \
valgrind valgrind \
&& \
rm -rf /var/lib/apt/lists/*
FROM apt AS mbedtls FROM apt AS mbedtls
RUN cd /tmp && \ RUN cd /tmp && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment