From 67feb61d9325dcde6b2e137896a6abe725405d52 Mon Sep 17 00:00:00 2001 From: Mahe Tardy Date: Mon, 10 Jul 2023 14:10:44 +0000 Subject: [PATCH] Dockerfiles: add explicit docker.io/library prefix This was causing renovate to treat golang and docker.io/library/golang as two separate images. Signed-off-by: Mahe Tardy --- Dockerfile.clang | 2 +- Dockerfile.clang-format | 2 +- Dockerfile.dev | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.clang b/Dockerfile.clang index bb26a5994a8..aef18f6ad36 100644 --- a/Dockerfile.clang +++ b/Dockerfile.clang @@ -1,4 +1,4 @@ -FROM ubuntu:22.04@sha256:6120be6a2b7ce665d0cbddc3ce6eae60fe94637c6a66985312d1f02f63cc0bcd +FROM docker.io/library/ubuntu:22.04@sha256:6120be6a2b7ce665d0cbddc3ce6eae60fe94637c6a66985312d1f02f63cc0bcd ARG VERSION=1:15.0.7-0ubuntu0.22.04.1 RUN apt-get update RUN apt-get -y upgrade diff --git a/Dockerfile.clang-format b/Dockerfile.clang-format index a984373ebb2..6f380de45ff 100644 --- a/Dockerfile.clang-format +++ b/Dockerfile.clang-format @@ -1,4 +1,4 @@ -FROM ubuntu:22.04@sha256:6120be6a2b7ce665d0cbddc3ce6eae60fe94637c6a66985312d1f02f63cc0bcd +FROM docker.io/library/ubuntu:22.04@sha256:6120be6a2b7ce665d0cbddc3ce6eae60fe94637c6a66985312d1f02f63cc0bcd RUN apt-get -y update RUN apt-get -y install clang-format-14 diff --git a/Dockerfile.dev b/Dockerfile.dev index 86ccf2384fb..330fa42e215 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -9,7 +9,7 @@ FROM quay.io/cilium/cilium-bpftool@sha256:1832b32d118e7006ea2ce530b14ae5b28acd55 COPY . ./ -FROM golang:1.20.5@sha256:344193a70dc3588452ea39b4a1e465a8d3c91f788ae053f7ee168cebf18e0a50 +FROM docker.io/library/golang:1.20.5@sha256:344193a70dc3588452ea39b4a1e465a8d3c91f788ae053f7ee168cebf18e0a50 RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y \