From 615f071d26527bb6cad548c16a71c2f761454db6 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Mon, 7 Dec 2020 12:53:53 -0500 Subject: [PATCH] merge apt-get commands to create less layers --- cmd/agent/Dockerfile | 6 +----- cmd/agent/Dockerfile.buildx | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cmd/agent/Dockerfile b/cmd/agent/Dockerfile index 32b0390f3c0f..731409543e34 100644 --- a/cmd/agent/Dockerfile +++ b/cmd/agent/Dockerfile @@ -15,11 +15,7 @@ FROM debian:buster-slim # Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list RUN apt-get update && apt-get install -t buster-backports -qy libsystemd-dev && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN apt-get update && \ - apt-get install -qy \ - tzdata ca-certificates && \ + apt-get install -qy tzdata ca-certificates && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY --from=build /src/agent/cmd/agent/agent /bin/agent diff --git a/cmd/agent/Dockerfile.buildx b/cmd/agent/Dockerfile.buildx index 7705041a9445..a32226ab8d3a 100644 --- a/cmd/agent/Dockerfile.buildx +++ b/cmd/agent/Dockerfile.buildx @@ -17,11 +17,7 @@ FROM debian:buster-slim # Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list RUN apt-get update && apt-get install -t buster-backports -qy libsystemd-dev && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN apt-get update && \ - apt-get install -qy \ - tzdata ca-certificates libsystemd-dev && \ + apt-get install -qy tzdata ca-certificates libsystemd-dev && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY --from=build /src/agent/cmd/agent/agent /bin/agent