diff options
author | Patrick Steinhardt <ps@pks.im> | 2020-02-18 15:20:08 +0100 |
---|---|---|
committer | Patrick Steinhardt <ps@pks.im> | 2020-02-18 15:38:24 +0100 |
commit | 76b49caf6a208e44d19c84caa6d42389f0de6194 (patch) | |
tree | 9fa829d3a9102fb2769debf260e6c85053b96a99 | |
parent | f9985688073cf5dd0d69eec01de0797f6987359a (diff) | |
download | libgit2-76b49caf6a208e44d19c84caa6d42389f0de6194.tar.gz |
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.
-rw-r--r-- | azure-pipelines/docker/bionic | 8 | ||||
-rw-r--r-- | azure-pipelines/docker/xenial | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/azure-pipelines/docker/bionic b/azure-pipelines/docker/bionic index 648bda704..179134f25 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 cb5d4919a..bf68b5e69 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 && \ |