From 69165ca425265258b75f71c35b5a0895e755c157 Mon Sep 17 00:00:00 2001 From: Clint Olson Date: Tue, 1 Oct 2024 18:16:43 -0700 Subject: [PATCH] Add comments and small optimizations --- docker/Dockerfile.client | 9 ++++++--- docker/Dockerfile.server | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.client b/docker/Dockerfile.client index a76ec048c..7fe134fbd 100644 --- a/docker/Dockerfile.client +++ b/docker/Dockerfile.client @@ -1,13 +1,16 @@ FROM debian:bookworm-slim +# Use ADD to avoid having to install curl +ADD --chmod=644 https://github.com/MisterTea/debian-et/raw/master/et.gpg /etc/apt/trusted.gpg.d/et.gpg + +# Use a run cache to speed up rebuilding and avoid having to remove the cache when we're done RUN --mount=type=cache,mode=0755,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,mode=0755,target=/var/cache/apt,sharing=locked \ rm -f /etc/apt/apt.conf.d/docker-clean && \ - apt-get update -qq && \ - apt-get install -y curl && \ echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache && \ + apt-get update -qq && \ + apt-get install -y ca-certificates && \ echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/ bookworm main" > /etc/apt/sources.list.d/et.list && \ - curl -sSL https://github.com/MisterTea/debian-et/raw/master/et.gpg > /etc/apt/trusted.gpg.d/et.gpg && \ apt-get update -qq && \ apt-get install -y et diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index c9ba3953c..6c55377f6 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -1,13 +1,16 @@ FROM debian:bookworm-slim +# Use ADD to avoid having to install curl +ADD --chmod=644 https://github.com/MisterTea/debian-et/raw/master/et.gpg /etc/apt/trusted.gpg.d/et.gpg + +# Use a run cache to speed up rebuilding and avoid having to remove the cache when we're done RUN --mount=type=cache,mode=0755,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,mode=0755,target=/var/cache/apt,sharing=locked \ rm -f /etc/apt/apt.conf.d/docker-clean && \ - apt-get update -qq && \ - apt-get install -y curl && \ echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache && \ + apt-get update -qq && \ + apt-get install -y ca-certificates && \ echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/ bookworm main" > /etc/apt/sources.list.d/et.list && \ - curl -sSL https://github.com/MisterTea/debian-et/raw/master/et.gpg > /etc/apt/trusted.gpg.d/et.gpg && \ apt-get update -qq && \ apt-get install -y et