From 4b5e2933b3c6ef056d1144616f831ef28f2be889 Mon Sep 17 00:00:00 2001 From: Josh Deprez Date: Tue, 19 Nov 2024 10:31:56 +1100 Subject: [PATCH] Use Ubuntu codename labels for base images --- .github/dependabot.yml | 5 +++++ packaging/docker/ubuntu-20.04/Dockerfile | 2 +- packaging/docker/ubuntu-22.04/Dockerfile | 2 +- packaging/docker/ubuntu-24.04/Dockerfile | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index daff892c97..a69ce44d4d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,11 @@ updates: - /packaging/docker/ubuntu-24.04 schedule: interval: weekly + groups: + container-images: + patterns: + - "*" + - package-ecosystem: gomod directory: / schedule: diff --git a/packaging/docker/ubuntu-20.04/Dockerfile b/packaging/docker/ubuntu-20.04/Dockerfile index 89d832704e..618d4a2558 100644 --- a/packaging/docker/ubuntu-20.04/Dockerfile +++ b/packaging/docker/ubuntu-20.04/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -FROM public.ecr.aws/buildkite/agent-base:ubuntu-20.04@sha256:6bcb19149500f017fa4fa75fc2a3c082d3f35df94784594737beaf62568e2613 +FROM public.ecr.aws/buildkite/agent-base:ubuntu-focal@sha256:c6b96cbb8500f371a30e1cbb830239eaff4ab3a692c10a90c36ce27815eec08c ARG TARGETOS ARG TARGETARCH diff --git a/packaging/docker/ubuntu-22.04/Dockerfile b/packaging/docker/ubuntu-22.04/Dockerfile index 07769cc47a..5ed7ffe1e3 100644 --- a/packaging/docker/ubuntu-22.04/Dockerfile +++ b/packaging/docker/ubuntu-22.04/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -FROM public.ecr.aws/buildkite/agent-base:ubuntu-22.04@sha256:ca90fbc56ff1813f486bc3d3787c4d2802f31eede330baf1dde3d6923ee89ea6 +FROM public.ecr.aws/buildkite/agent-base:ubuntu-jammy@sha256:5971531b64dcb926395b5c8b7a20b02b7d15dd4724ccae9ad330633c7438ba9b ARG TARGETOS ARG TARGETARCH diff --git a/packaging/docker/ubuntu-24.04/Dockerfile b/packaging/docker/ubuntu-24.04/Dockerfile index 08ac527390..929ff15dd1 100644 --- a/packaging/docker/ubuntu-24.04/Dockerfile +++ b/packaging/docker/ubuntu-24.04/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 -FROM public.ecr.aws/buildkite/agent-base:ubuntu-24.04@sha256:56b7751485d03ed3dce567e37cfc879db94b25ec827ee016615e36bc3e266516 +FROM public.ecr.aws/buildkite/agent-base:ubuntu-noble@sha256:89f0eda84bf61f0cff8dcf54d224fbd6c4d6355db0caf04accc1c3e325735e7f ARG TARGETOS ARG TARGETARCH