From 5903cefee372c9be2d6e3dfc5e431d7c408d465f Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Mon, 20 Mar 2023 21:07:40 +0100 Subject: [PATCH] Docker: Keep old config files when updating packages Signed-off-by: Michael Mayer --- docker/demo/setup.sh | 3 ++- docker/develop/armv7/Dockerfile | 1 + docker/develop/bookworm-slim/Dockerfile | 1 + docker/develop/bookworm/Dockerfile | 1 + docker/develop/bullseye-slim/Dockerfile | 1 + docker/develop/bullseye/Dockerfile | 1 + docker/develop/buster/Dockerfile | 1 + docker/develop/impish/Dockerfile | 1 + docker/develop/jammy-slim/Dockerfile | 1 + docker/develop/jammy/Dockerfile | 1 + docker/photoprism/armv7/Dockerfile | 1 + docker/photoprism/buster/Dockerfile | 1 + docker/photoprism/impish/Dockerfile | 1 + docker/tensorflow/Dockerfile | 3 ++- docker/tensorflow/arm64/Dockerfile | 3 ++- 15 files changed, 18 insertions(+), 3 deletions(-) diff --git a/docker/demo/setup.sh b/docker/demo/setup.sh index c941a79d3..e781d4d8a 100755 --- a/docker/demo/setup.sh +++ b/docker/demo/setup.sh @@ -40,7 +40,8 @@ echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ -echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing +echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ +echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold # update operating system apt-get update diff --git a/docker/develop/armv7/Dockerfile b/docker/develop/armv7/Dockerfile index e2894cf98..bf459f49b 100644 --- a/docker/develop/armv7/Dockerfile +++ b/docker/develop/armv7/Dockerfile @@ -47,6 +47,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq upgrade && apt-get -qq install --no-install-recommends \ apt-utils gpg pkg-config software-properties-common ca-certificates avahi-utils \ build-essential gcc g++ sudo bash make nano lsof lshw git jq \ diff --git a/docker/develop/bookworm-slim/Dockerfile b/docker/develop/bookworm-slim/Dockerfile index e84adfe6b..14311f498 100644 --- a/docker/develop/bookworm-slim/Dockerfile +++ b/docker/develop/bookworm-slim/Dockerfile @@ -42,6 +42,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq upgrade && \ apt-get -qq install \ libc6 ca-certificates sudo bash tzdata \ diff --git a/docker/develop/bookworm/Dockerfile b/docker/develop/bookworm/Dockerfile index 45fa4d85b..a3f618773 100644 --- a/docker/develop/bookworm/Dockerfile +++ b/docker/develop/bookworm/Dockerfile @@ -48,6 +48,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq upgrade && \ apt-get -qq install \ libc6 ca-certificates sudo bash tzdata \ diff --git a/docker/develop/bullseye-slim/Dockerfile b/docker/develop/bullseye-slim/Dockerfile index 825a46b67..1a1504662 100644 --- a/docker/develop/bullseye-slim/Dockerfile +++ b/docker/develop/bullseye-slim/Dockerfile @@ -42,6 +42,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ ca-certificates \ jq \ diff --git a/docker/develop/bullseye/Dockerfile b/docker/develop/bullseye/Dockerfile index 014454623..4c39c71e2 100644 --- a/docker/develop/bullseye/Dockerfile +++ b/docker/develop/bullseye/Dockerfile @@ -48,6 +48,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq dist-upgrade && \ apt-get -qq install \ apt-utils \ diff --git a/docker/develop/buster/Dockerfile b/docker/develop/buster/Dockerfile index 960a98ee9..c8597fdac 100644 --- a/docker/develop/buster/Dockerfile +++ b/docker/develop/buster/Dockerfile @@ -48,6 +48,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ apt-utils \ gpg \ diff --git a/docker/develop/impish/Dockerfile b/docker/develop/impish/Dockerfile index db15b7c81..59dbfbf45 100644 --- a/docker/develop/impish/Dockerfile +++ b/docker/develop/impish/Dockerfile @@ -47,6 +47,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ apt-utils \ gpg \ diff --git a/docker/develop/jammy-slim/Dockerfile b/docker/develop/jammy-slim/Dockerfile index 68b93a105..a5ae0328c 100644 --- a/docker/develop/jammy-slim/Dockerfile +++ b/docker/develop/jammy-slim/Dockerfile @@ -41,6 +41,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq upgrade && \ apt-get -qq install \ libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw \ diff --git a/docker/develop/jammy/Dockerfile b/docker/develop/jammy/Dockerfile index 36d288f66..8a75fbb88 100644 --- a/docker/develop/jammy/Dockerfile +++ b/docker/develop/jammy/Dockerfile @@ -47,6 +47,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq upgrade && \ apt-get -qq install \ libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw \ diff --git a/docker/photoprism/armv7/Dockerfile b/docker/photoprism/armv7/Dockerfile index c95c925f7..b9b8dd89c 100644 --- a/docker/photoprism/armv7/Dockerfile +++ b/docker/photoprism/armv7/Dockerfile @@ -101,6 +101,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq upgrade && \ apt-get -qq install --no-install-recommends \ libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw \ diff --git a/docker/photoprism/buster/Dockerfile b/docker/photoprism/buster/Dockerfile index 272c35495..e1042c7d7 100644 --- a/docker/photoprism/buster/Dockerfile +++ b/docker/photoprism/buster/Dockerfile @@ -102,6 +102,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ ca-certificates \ jq \ diff --git a/docker/photoprism/impish/Dockerfile b/docker/photoprism/impish/Dockerfile index 5b9b550c0..487979abe 100644 --- a/docker/photoprism/impish/Dockerfile +++ b/docker/photoprism/impish/Dockerfile @@ -101,6 +101,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \ apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ ca-certificates \ jq \ diff --git a/docker/tensorflow/Dockerfile b/docker/tensorflow/Dockerfile index 7a834b4f1..729c85451 100644 --- a/docker/tensorflow/Dockerfile +++ b/docker/tensorflow/Dockerfile @@ -11,7 +11,8 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ - echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissin + echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissin && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold # Install dev / build dependencies RUN apt-get update && apt-get upgrade && \ diff --git a/docker/tensorflow/arm64/Dockerfile b/docker/tensorflow/arm64/Dockerfile index 1a277ddfe..a5febe1f2 100644 --- a/docker/tensorflow/arm64/Dockerfile +++ b/docker/tensorflow/arm64/Dockerfile @@ -11,7 +11,8 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends && \ echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ - echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissin + echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissin && \ + echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold # Install dev / build dependencies RUN apt-get update && apt-get upgrade && \