From e039cae5c881ac8d38d90b5a3fac197663f0f47c Mon Sep 17 00:00:00 2001 From: Jenny Danzmayr Date: Sun, 12 Nov 2023 19:04:08 +0100 Subject: [PATCH] used a seperate cache for each target architecture --- docker/Dockerfile | 6 ++++-- docker/tileserver.dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f9b35fbc..f905f06a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,10 @@ # syntax=docker/dockerfile:1.4 FROM ubuntu:lunar-20231004@sha256:51e70689b125fcc2e800f5efb7ba465dee85ede9da9c268ff5599053c7e52b77 as base +ARG TARGETARCH ENV DEBIAN_FRONTEND noninteractive -RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ +RUN --mount=type=cache,target=/var/cache/apt,id=apt_$TARGETARCH --mount=type=tmpfs,target=/var/lib/apt/lists \ + rm /etc/apt/apt.conf.d/docker-clean && \ apt-get update && apt-get install -y --no-install-recommends \ python3.11=3.11.4-1~23.04 \ # renovate: srcname=python3.11 @@ -28,7 +30,7 @@ ENV PATH="/usr/lib/postgresql/14/bin/:$PATH" FROM base as builder -RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ +RUN --mount=type=cache,target=/var/cache/apt,id=apt_$TARGETARCH --mount=type=tmpfs,target=/var/lib/apt/lists \ apt-get update && apt-get install -y --no-install-recommends \ build-essential=12.9ubuntu3 \ # renovate: srcname=python3.11 diff --git a/docker/tileserver.dockerfile b/docker/tileserver.dockerfile index 3a74a4af..67369704 100644 --- a/docker/tileserver.dockerfile +++ b/docker/tileserver.dockerfile @@ -1,8 +1,10 @@ # syntax=docker/dockerfile:1.4 FROM ubuntu:lunar-20231004@sha256:51e70689b125fcc2e800f5efb7ba465dee85ede9da9c268ff5599053c7e52b77 as base +ARG TARGETARCH ENV DEBIAN_FRONTEND noninteractive -RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ +RUN --mount=type=cache,target=/var/cache/apt,id=apt_$TARGETARCH --mount=type=tmpfs,target=/var/lib/apt/lists \ + rm /etc/apt/apt.conf.d/docker-clean && \ apt-get update && apt-get install -y --no-install-recommends \ python3.11=3.11.4-1~23.04 \ # renovate: srcname=python3.11 @@ -18,7 +20,7 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/ FROM base as builder -RUN --mount=type=cache,target=/var/cache/apt --mount=type=tmpfs,target=/var/lib/apt/lists \ +RUN --mount=type=cache,target=/var/cache/apt,id=apt_$TARGETARCH --mount=type=tmpfs,target=/var/lib/apt/lists \ apt-get update && apt-get install -y --no-install-recommends \ build-essential=12.9ubuntu3 \ # renovate: srcname=python3.11