Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 9.0/buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e
FROM buildpack-deps:buster

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.0/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc
FROM debian:buster-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.10/bookworm.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bookworm",
abbr = "deb12",
image = "debian:bookworm",
digest = "sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168",
},
ghc = {
version = "9.10.3",
Expand Down
2 changes: 1 addition & 1 deletion 9.10/bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm@sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168
FROM debian:bookworm

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.10/bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bullseye",
abbr = "deb11",
image = "debian:bullseye",
digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89",
},
ghc = {
version = "9.10.3",
Expand Down
2 changes: 1 addition & 1 deletion 9.10/bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89
FROM debian:bullseye

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.10/buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster@sha256:58ce6f1271ae1c8a2006ff7d3e54e9874d839f573d8009c20154ad0f2fb0a225
FROM debian:buster

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.10/slim-bookworm.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bookworm",
abbr = "deb12",
image = "debian:bookworm-slim",
digest = "sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df",
},
ghc = {
version = "9.10.3",
Expand Down
2 changes: 1 addition & 1 deletion 9.10/slim-bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim@sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df
FROM debian:bookworm-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.10/slim-bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bullseye",
abbr = "deb11",
image = "debian:bullseye-slim",
digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84",
},
ghc = {
version = "9.10.3",
Expand Down
2 changes: 1 addition & 1 deletion 9.10/slim-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84
FROM debian:bullseye-slim

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.10/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc
FROM debian:buster-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.12/bookworm.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bookworm",
abbr = "deb12",
image = "debian:bookworm",
digest = "sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168",
},
ghc = {
version = "9.12.4",
Expand Down
2 changes: 1 addition & 1 deletion 9.12/bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm@sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168
FROM debian:bookworm

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.12/bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bullseye",
abbr = "deb11",
image = "debian:bullseye",
digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89",
},
ghc = {
version = "9.12.4",
Expand Down
2 changes: 1 addition & 1 deletion 9.12/bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89
FROM debian:bullseye

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.12/slim-bookworm.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bookworm",
abbr = "deb12",
image = "debian:bookworm-slim",
digest = "sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df",
},
ghc = {
version = "9.12.4",
Expand Down
2 changes: 1 addition & 1 deletion 9.12/slim-bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim@sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df
FROM debian:bookworm-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.12/slim-bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bullseye",
abbr = "deb11",
image = "debian:bullseye-slim",
digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84",
},
ghc = {
version = "9.12.4",
Expand Down
2 changes: 1 addition & 1 deletion 9.12/slim-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84
FROM debian:bullseye-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.14/bookworm.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bookworm",
abbr = "deb12",
image = "debian:bookworm",
digest = "sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168",
},
ghc = {
version = "9.14.1",
Expand Down
2 changes: 1 addition & 1 deletion 9.14/bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm@sha256:30482e873082e906a4908c10529180aefb6f77620aea7404b909829fadc5d168
FROM debian:bookworm

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.14/bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bullseye",
abbr = "deb11",
image = "debian:bullseye",
digest = "sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89",
},
ghc = {
version = "9.14.1",
Expand Down
2 changes: 1 addition & 1 deletion 9.14/bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89
FROM debian:bullseye

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.14/slim-bookworm.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bookworm",
abbr = "deb12",
image = "debian:bookworm-slim",
digest = "sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df",
},
ghc = {
version = "9.14.1",
Expand Down
2 changes: 1 addition & 1 deletion 9.14/slim-bookworm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim@sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df
FROM debian:bookworm-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.14/slim-bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ globals
codename = "bullseye",
abbr = "deb11",
image = "debian:bullseye-slim",
digest = "sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84",
},
ghc = {
version = "9.14.1",
Expand Down
2 changes: 1 addition & 1 deletion 9.14/slim-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84
FROM debian:bullseye-slim

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.2/buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e
FROM buildpack-deps:buster

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.2/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc
FROM debian:buster-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.4/bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion 9.4/bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89
FROM debian:bullseye

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.4/buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e
FROM buildpack-deps:buster

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.4/slim-bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion 9.4/slim-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84
FROM debian:bullseye-slim

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.4/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc
FROM debian:buster-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.6/bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion 9.6/bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89
FROM debian:bullseye

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.6/buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e
FROM buildpack-deps:buster

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.6/slim-bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion 9.6/slim-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84
FROM debian:bullseye-slim

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.6/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc
FROM debian:buster-slim

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.8/bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion 9.8/bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye@sha256:e7100042ddfd3c1fb9d4a5bf15acbdb1058d7bb3340142916d3413a5c001fc89
FROM debian:bullseye

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.8/buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:buster@sha256:c9285bcb198c0ae171bfc350a4af94ddfda547c4e4d2900a92c280232319341e
FROM buildpack-deps:buster

ENV LANG=C.UTF-8

Expand Down
1 change: 0 additions & 1 deletion 9.8/slim-bullseye.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion 9.8/slim-bullseye/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye-slim@sha256:f18adf4e1d04b1d8ba48025b8e35003f4c748ddd3dd8e875fe4e7d9a9c0dec84
FROM debian:bullseye-slim

ENV LANG=C.UTF-8

Expand Down
2 changes: 1 addition & 1 deletion 9.8/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim@sha256:bb3dc79fddbca7e8903248ab916bb775c96ec61014b3d02b4f06043b604726dc
FROM debian:buster-slim

ENV LANG=C.UTF-8

Expand Down
7 changes: 7 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
}
10 changes: 1 addition & 9 deletions template/Dockerfile.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions template/schema.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ in
image
| String
| doc "Docker image identifier",
digest
| String
| optional
| doc "Image digest, e.g. sha256:ed4fcc40bb1162b6d2d32e7bec15044d13963779abbe63f67f1cd62b06220519",
},
ghc
| {
Expand Down
Loading