From: Josh Soref Date: Sun, 29 Aug 2021 14:48:46 +0000 (-0400) Subject: docker: merge apt-get update & install layers X-Git-Tag: dnsdist-1.7.0-alpha1~40^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a43494b2c9b888e28fc4be31e98916caa14046dc;p=thirdparty%2Fpdns.git docker: merge apt-get update & install layers Otherwise the one could be stale relative to the other --- diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2 index fea16594d5..b095e4471f 100644 --- a/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2 +++ b/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2 @@ -1,7 +1,6 @@ FROM {{ os_image }}:{{ os_version }} -RUN apt-get update -RUN apt-get install -y curl gnupg dnsutils apt-transport-https +RUN apt-get update && apt-get install -y curl gnupg dnsutils apt-transport-https {% if release.startswith('dnsdist-') %} COPY pkg-pin /etc/apt/preferences.d/dnsdist @@ -13,8 +12,7 @@ COPY pdns.list.{{ release }}.{{ os }}-{{ os_version }} /etc/apt/sources.list.d/p RUN curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add - RUN curl https://repo.powerdns.com/CBC8B383-pub.asc | apt-key add - -RUN apt-get update -RUN apt-get install -y {{ pkg }} +RUN apt-get update && apt-get install -y {{ pkg }} {# in the old script this was just for rec-43, -44 and -45 #} {% if release.startswith('rec-') %}