From a8f66028624de9e262d55aff7c2837d04b87c636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Fri, 10 Jul 2026 07:12:12 +0200 Subject: [PATCH] fix: drop pinned base image digests from FROM lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit official-images doesn't accept digest-pinned FROM lines — bashbrew resolves the parent image from the tag and rebuilds haskell images whenever the base image is rebuilt, which pinning defeats. See https://github.com/docker-library/official-images/pull/21812 - remove the digest field from the Nickel schema, template, and all variant data files, and regenerate the Dockerfiles - strip digests from the hand-maintained buster/slim-buster Dockerfiles - disable Renovate's pinDigests for Dockerfiles so they don't come back --- 9.0/buster/Dockerfile | 2 +- 9.0/slim-buster/Dockerfile | 2 +- 9.10/bookworm.ncl | 1 - 9.10/bookworm/Dockerfile | 2 +- 9.10/bullseye.ncl | 1 - 9.10/bullseye/Dockerfile | 2 +- 9.10/buster/Dockerfile | 2 +- 9.10/slim-bookworm.ncl | 1 - 9.10/slim-bookworm/Dockerfile | 2 +- 9.10/slim-bullseye.ncl | 1 - 9.10/slim-bullseye/Dockerfile | 2 +- 9.10/slim-buster/Dockerfile | 2 +- 9.12/bookworm.ncl | 1 - 9.12/bookworm/Dockerfile | 2 +- 9.12/bullseye.ncl | 1 - 9.12/bullseye/Dockerfile | 2 +- 9.12/slim-bookworm.ncl | 1 - 9.12/slim-bookworm/Dockerfile | 2 +- 9.12/slim-bullseye.ncl | 1 - 9.12/slim-bullseye/Dockerfile | 2 +- 9.14/bookworm.ncl | 1 - 9.14/bookworm/Dockerfile | 2 +- 9.14/bullseye.ncl | 1 - 9.14/bullseye/Dockerfile | 2 +- 9.14/slim-bookworm.ncl | 1 - 9.14/slim-bookworm/Dockerfile | 2 +- 9.14/slim-bullseye.ncl | 1 - 9.14/slim-bullseye/Dockerfile | 2 +- 9.2/buster/Dockerfile | 2 +- 9.2/slim-buster/Dockerfile | 2 +- 9.4/bullseye.ncl | 1 - 9.4/bullseye/Dockerfile | 2 +- 9.4/buster/Dockerfile | 2 +- 9.4/slim-bullseye.ncl | 1 - 9.4/slim-bullseye/Dockerfile | 2 +- 9.4/slim-buster/Dockerfile | 2 +- 9.6/bullseye.ncl | 1 - 9.6/bullseye/Dockerfile | 2 +- 9.6/buster/Dockerfile | 2 +- 9.6/slim-bullseye.ncl | 1 - 9.6/slim-bullseye/Dockerfile | 2 +- 9.6/slim-buster/Dockerfile | 2 +- 9.8/bullseye.ncl | 1 - 9.8/bullseye/Dockerfile | 2 +- 9.8/buster/Dockerfile | 2 +- 9.8/slim-bullseye.ncl | 1 - 9.8/slim-bullseye/Dockerfile | 2 +- 9.8/slim-buster/Dockerfile | 2 +- renovate.json | 7 +++++++ template/Dockerfile.ncl | 10 +--------- template/schema.ncl | 4 ---- 51 files changed, 38 insertions(+), 61 deletions(-) diff --git a/9.0/buster/Dockerfile b/9.0/buster/Dockerfile index 292a06c5..47677595 100644 --- a/9.0/buster/Dockerfile +++ b/9.0/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e +FROM buildpack-deps:buster ENV LANG=C.UTF-8 diff --git a/9.0/slim-buster/Dockerfile b/9.0/slim-buster/Dockerfile index 30615150..d70fd8c1 100644 --- a/9.0/slim-buster/Dockerfile +++ b/9.0/slim-buster/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc +FROM debian:buster-slim ENV LANG=C.UTF-8 diff --git a/9.10/bookworm.ncl b/9.10/bookworm.ncl index 240c412e..95a18ecc 100644 --- a/9.10/bookworm.ncl +++ b/9.10/bookworm.ncl @@ -6,7 +6,6 @@ globals codename = "bookworm", abbr = "deb12", image = "debian:bookworm", - digest = "sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168", }, ghc = { version = "9.10.3", diff --git a/9.10/bookworm/Dockerfile b/9.10/bookworm/Dockerfile index 6807bf45..474addce 100644 --- a/9.10/bookworm/Dockerfile +++ b/9.10/bookworm/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm@sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168 +FROM debian:bookworm ENV LANG=C.UTF-8 diff --git a/9.10/bullseye.ncl b/9.10/bullseye.ncl index af6d5854..de155449 100644 --- a/9.10/bullseye.ncl +++ b/9.10/bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye", - digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89", }, ghc = { version = "9.10.3", diff --git a/9.10/bullseye/Dockerfile b/9.10/bullseye/Dockerfile index 7dad4c88..eb16e517 100644 --- a/9.10/bullseye/Dockerfile +++ b/9.10/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89 +FROM debian:bullseye ENV LANG=C.UTF-8 diff --git a/9.10/buster/Dockerfile b/9.10/buster/Dockerfile index e84f0ae7..ea9e722e 100644 --- a/9.10/buster/Dockerfile +++ b/9.10/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster@sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225 +FROM debian:buster ENV LANG=C.UTF-8 diff --git a/9.10/slim-bookworm.ncl b/9.10/slim-bookworm.ncl index b92d1660..df7510c0 100644 --- a/9.10/slim-bookworm.ncl +++ b/9.10/slim-bookworm.ncl @@ -6,7 +6,6 @@ globals codename = "bookworm", abbr = "deb12", image = "debian:bookworm-slim", - digest = "sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df", }, ghc = { version = "9.10.3", diff --git a/9.10/slim-bookworm/Dockerfile b/9.10/slim-bookworm/Dockerfile index 019072d9..8826870d 100644 --- a/9.10/slim-bookworm/Dockerfile +++ b/9.10/slim-bookworm/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim@sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df +FROM debian:bookworm-slim ENV LANG=C.UTF-8 diff --git a/9.10/slim-bullseye.ncl b/9.10/slim-bullseye.ncl index a4190c24..11a1100c 100644 --- a/9.10/slim-bullseye.ncl +++ b/9.10/slim-bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye-slim", - digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84", }, ghc = { version = "9.10.3", diff --git a/9.10/slim-bullseye/Dockerfile b/9.10/slim-bullseye/Dockerfile index 6401c971..13d2fcff 100644 --- a/9.10/slim-bullseye/Dockerfile +++ b/9.10/slim-bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84 +FROM debian:bullseye-slim ENV LANG=C.UTF-8 diff --git a/9.10/slim-buster/Dockerfile b/9.10/slim-buster/Dockerfile index 0b050634..11bc6156 100644 --- a/9.10/slim-buster/Dockerfile +++ b/9.10/slim-buster/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc +FROM debian:buster-slim ENV LANG=C.UTF-8 diff --git a/9.12/bookworm.ncl b/9.12/bookworm.ncl index 634636b9..862880e4 100644 --- a/9.12/bookworm.ncl +++ b/9.12/bookworm.ncl @@ -6,7 +6,6 @@ globals codename = "bookworm", abbr = "deb12", image = "debian:bookworm", - digest = "sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168", }, ghc = { version = "9.12.4", diff --git a/9.12/bookworm/Dockerfile b/9.12/bookworm/Dockerfile index 508eedaa..8fa85a16 100644 --- a/9.12/bookworm/Dockerfile +++ b/9.12/bookworm/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm@sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168 +FROM debian:bookworm ENV LANG=C.UTF-8 diff --git a/9.12/bullseye.ncl b/9.12/bullseye.ncl index 5e2e33fd..86cd24de 100644 --- a/9.12/bullseye.ncl +++ b/9.12/bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye", - digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89", }, ghc = { version = "9.12.4", diff --git a/9.12/bullseye/Dockerfile b/9.12/bullseye/Dockerfile index 792b46c9..7a8bdfeb 100644 --- a/9.12/bullseye/Dockerfile +++ b/9.12/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89 +FROM debian:bullseye ENV LANG=C.UTF-8 diff --git a/9.12/slim-bookworm.ncl b/9.12/slim-bookworm.ncl index 2c89a265..17f527d2 100644 --- a/9.12/slim-bookworm.ncl +++ b/9.12/slim-bookworm.ncl @@ -6,7 +6,6 @@ globals codename = "bookworm", abbr = "deb12", image = "debian:bookworm-slim", - digest = "sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df", }, ghc = { version = "9.12.4", diff --git a/9.12/slim-bookworm/Dockerfile b/9.12/slim-bookworm/Dockerfile index cef35126..ea225fd6 100644 --- a/9.12/slim-bookworm/Dockerfile +++ b/9.12/slim-bookworm/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim@sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df +FROM debian:bookworm-slim ENV LANG=C.UTF-8 diff --git a/9.12/slim-bullseye.ncl b/9.12/slim-bullseye.ncl index 3e67467b..d9d5920e 100644 --- a/9.12/slim-bullseye.ncl +++ b/9.12/slim-bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye-slim", - digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84", }, ghc = { version = "9.12.4", diff --git a/9.12/slim-bullseye/Dockerfile b/9.12/slim-bullseye/Dockerfile index af6fc9c3..9d5f4239 100644 --- a/9.12/slim-bullseye/Dockerfile +++ b/9.12/slim-bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84 +FROM debian:bullseye-slim ENV LANG=C.UTF-8 diff --git a/9.14/bookworm.ncl b/9.14/bookworm.ncl index 9b8c84ef..d181e9f1 100644 --- a/9.14/bookworm.ncl +++ b/9.14/bookworm.ncl @@ -6,7 +6,6 @@ globals codename = "bookworm", abbr = "deb12", image = "debian:bookworm", - digest = "sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168", }, ghc = { version = "9.14.1", diff --git a/9.14/bookworm/Dockerfile b/9.14/bookworm/Dockerfile index 944e03bf..64ac1f97 100644 --- a/9.14/bookworm/Dockerfile +++ b/9.14/bookworm/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm@sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168 +FROM debian:bookworm ENV LANG=C.UTF-8 diff --git a/9.14/bullseye.ncl b/9.14/bullseye.ncl index 8aa47600..ae9bd2ed 100644 --- a/9.14/bullseye.ncl +++ b/9.14/bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye", - digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89", }, ghc = { version = "9.14.1", diff --git a/9.14/bullseye/Dockerfile b/9.14/bullseye/Dockerfile index 0f256947..31b29b68 100644 --- a/9.14/bullseye/Dockerfile +++ b/9.14/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89 +FROM debian:bullseye ENV LANG=C.UTF-8 diff --git a/9.14/slim-bookworm.ncl b/9.14/slim-bookworm.ncl index d49ed13a..1421dbef 100644 --- a/9.14/slim-bookworm.ncl +++ b/9.14/slim-bookworm.ncl @@ -6,7 +6,6 @@ globals codename = "bookworm", abbr = "deb12", image = "debian:bookworm-slim", - digest = "sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df", }, ghc = { version = "9.14.1", diff --git a/9.14/slim-bookworm/Dockerfile b/9.14/slim-bookworm/Dockerfile index 4fa6102f..9b1fed0a 100644 --- a/9.14/slim-bookworm/Dockerfile +++ b/9.14/slim-bookworm/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim@sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df +FROM debian:bookworm-slim ENV LANG=C.UTF-8 diff --git a/9.14/slim-bullseye.ncl b/9.14/slim-bullseye.ncl index 68b92e2f..0e3d1568 100644 --- a/9.14/slim-bullseye.ncl +++ b/9.14/slim-bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye-slim", - digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84", }, ghc = { version = "9.14.1", diff --git a/9.14/slim-bullseye/Dockerfile b/9.14/slim-bullseye/Dockerfile index 23268716..f5f8f434 100644 --- a/9.14/slim-bullseye/Dockerfile +++ b/9.14/slim-bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84 +FROM debian:bullseye-slim ENV LANG=C.UTF-8 diff --git a/9.2/buster/Dockerfile b/9.2/buster/Dockerfile index da591d5b..ad468ab7 100644 --- a/9.2/buster/Dockerfile +++ b/9.2/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e +FROM buildpack-deps:buster ENV LANG=C.UTF-8 diff --git a/9.2/slim-buster/Dockerfile b/9.2/slim-buster/Dockerfile index 933b1b91..9766768d 100644 --- a/9.2/slim-buster/Dockerfile +++ b/9.2/slim-buster/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc +FROM debian:buster-slim ENV LANG=C.UTF-8 diff --git a/9.4/bullseye.ncl b/9.4/bullseye.ncl index 7b8b4838..69214d23 100644 --- a/9.4/bullseye.ncl +++ b/9.4/bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye", - digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89", }, ghc = import "_ghc.ncl", cabal_install = import "_cabal-install.ncl", diff --git a/9.4/bullseye/Dockerfile b/9.4/bullseye/Dockerfile index 0003527a..a09864f7 100644 --- a/9.4/bullseye/Dockerfile +++ b/9.4/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89 +FROM debian:bullseye ENV LANG=C.UTF-8 diff --git a/9.4/buster/Dockerfile b/9.4/buster/Dockerfile index 122835d2..770756fb 100644 --- a/9.4/buster/Dockerfile +++ b/9.4/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e +FROM buildpack-deps:buster ENV LANG=C.UTF-8 diff --git a/9.4/slim-bullseye.ncl b/9.4/slim-bullseye.ncl index 190a0cfe..13f6ea51 100644 --- a/9.4/slim-bullseye.ncl +++ b/9.4/slim-bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye-slim", - digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84", }, ghc = import "_ghc.ncl", cabal_install = import "_cabal-install.ncl", diff --git a/9.4/slim-bullseye/Dockerfile b/9.4/slim-bullseye/Dockerfile index b4d3c959..27477b75 100644 --- a/9.4/slim-bullseye/Dockerfile +++ b/9.4/slim-bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84 +FROM debian:bullseye-slim ENV LANG=C.UTF-8 diff --git a/9.4/slim-buster/Dockerfile b/9.4/slim-buster/Dockerfile index fe2ef34f..8ae51d1e 100644 --- a/9.4/slim-buster/Dockerfile +++ b/9.4/slim-buster/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc +FROM debian:buster-slim ENV LANG=C.UTF-8 diff --git a/9.6/bullseye.ncl b/9.6/bullseye.ncl index 7b8b4838..69214d23 100644 --- a/9.6/bullseye.ncl +++ b/9.6/bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye", - digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89", }, ghc = import "_ghc.ncl", cabal_install = import "_cabal-install.ncl", diff --git a/9.6/bullseye/Dockerfile b/9.6/bullseye/Dockerfile index aa7a91f2..77b5ecbe 100644 --- a/9.6/bullseye/Dockerfile +++ b/9.6/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89 +FROM debian:bullseye ENV LANG=C.UTF-8 diff --git a/9.6/buster/Dockerfile b/9.6/buster/Dockerfile index 42c1c49b..1d6d7644 100644 --- a/9.6/buster/Dockerfile +++ b/9.6/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e +FROM buildpack-deps:buster ENV LANG=C.UTF-8 diff --git a/9.6/slim-bullseye.ncl b/9.6/slim-bullseye.ncl index 190a0cfe..13f6ea51 100644 --- a/9.6/slim-bullseye.ncl +++ b/9.6/slim-bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye-slim", - digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84", }, ghc = import "_ghc.ncl", cabal_install = import "_cabal-install.ncl", diff --git a/9.6/slim-bullseye/Dockerfile b/9.6/slim-bullseye/Dockerfile index 47a0586d..ff678e89 100644 --- a/9.6/slim-bullseye/Dockerfile +++ b/9.6/slim-bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84 +FROM debian:bullseye-slim ENV LANG=C.UTF-8 diff --git a/9.6/slim-buster/Dockerfile b/9.6/slim-buster/Dockerfile index ad26eb1d..7db44f0d 100644 --- a/9.6/slim-buster/Dockerfile +++ b/9.6/slim-buster/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc +FROM debian:buster-slim ENV LANG=C.UTF-8 diff --git a/9.8/bullseye.ncl b/9.8/bullseye.ncl index 7b8b4838..69214d23 100644 --- a/9.8/bullseye.ncl +++ b/9.8/bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye", - digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89", }, ghc = import "_ghc.ncl", cabal_install = import "_cabal-install.ncl", diff --git a/9.8/bullseye/Dockerfile b/9.8/bullseye/Dockerfile index ea968b59..7a9eccc0 100644 --- a/9.8/bullseye/Dockerfile +++ b/9.8/bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89 +FROM debian:bullseye ENV LANG=C.UTF-8 diff --git a/9.8/buster/Dockerfile b/9.8/buster/Dockerfile index 1bf6fa9c..5f18db77 100644 --- a/9.8/buster/Dockerfile +++ b/9.8/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e +FROM buildpack-deps:buster ENV LANG=C.UTF-8 diff --git a/9.8/slim-bullseye.ncl b/9.8/slim-bullseye.ncl index 190a0cfe..13f6ea51 100644 --- a/9.8/slim-bullseye.ncl +++ b/9.8/slim-bullseye.ncl @@ -6,7 +6,6 @@ globals codename = "bullseye", abbr = "deb11", image = "debian:bullseye-slim", - digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84", }, ghc = import "_ghc.ncl", cabal_install = import "_cabal-install.ncl", diff --git a/9.8/slim-bullseye/Dockerfile b/9.8/slim-bullseye/Dockerfile index ee217f41..c67b12d8 100644 --- a/9.8/slim-bullseye/Dockerfile +++ b/9.8/slim-bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84 +FROM debian:bullseye-slim ENV LANG=C.UTF-8 diff --git a/9.8/slim-buster/Dockerfile b/9.8/slim-buster/Dockerfile index 51f281d8..f02c5e59 100644 --- a/9.8/slim-buster/Dockerfile +++ b/9.8/slim-buster/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc +FROM debian:buster-slim ENV LANG=C.UTF-8 diff --git a/renovate.json b/renovate.json index 48515b9f..94ef2bb9 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,12 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:best-practices" + ], + "packageRules": [ + { + "description": "official-images does not accept digest-pinned FROM lines (https://github.com/docker-library/official-images/pull/21812)", + "matchManagers": ["dockerfile"], + "pinDigests": false + } ] } diff --git a/template/Dockerfile.ncl b/template/Dockerfile.ncl index d14edfb0..6bc38678 100644 --- a/template/Dockerfile.ncl +++ b/template/Dockerfile.ncl @@ -9,16 +9,8 @@ let render = fun cfg => else "" in - let digest_part = - if std.record.has_field "digest" distro then - "@%{distro.digest}" - else - "" - in - let from_ref = "%{distro.image}%{digest_part}" - in m%" -FROM %{from_ref} +FROM %{distro.image} ENV LANG=C.UTF-8 diff --git a/template/schema.ncl b/template/schema.ncl index adbb9a9d..47ab6fdb 100644 --- a/template/schema.ncl +++ b/template/schema.ncl @@ -54,10 +54,6 @@ in image | String | doc "Docker image identifier", - digest - | String - | optional - | doc "Image digest, e.g. sha256:ed4fcc40bb1162b6d2d32e7bec15044d13963779abbe63f67f1cd62b06220519", }, ghc | {