Use fully qualified remote Docker image names

slipher · slipher · commit ef8e690a04a3 · 2025-10-31T09:15:32.000-05:00
Avoids package squatting vulnerabilities in the presence of multiple registries a la https://medium.com/@alex.birsan/dependency-confusion-4a5d60fec610.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM docker.io/debian:bullseye-slim
 
 # Toolchain dependencies for Unvanquished, Daemon, external_deps, or build-release
 ENV TOOLCHAIN_DEPS=' \
diff --git a/docker/unvanquished-chown-system.Dockerfile b/docker/unvanquished-chown-system.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:trixie-slim
+FROM docker.io/debian:trixie-slim
 
 RUN mkdir /docker
 COPY docker/common.sh /docker
diff --git a/docker/unvanquished-darling-system.Dockerfile b/docker/unvanquished-darling-system.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM docker.io/ubuntu:focal
 
 ARG build_macos=true
 
diff --git a/docker/unvanquished-linux-system.Dockerfile b/docker/unvanquished-linux-system.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM docker.io/debian:bullseye-slim
 
 ARG build_linux=true
 
diff --git a/docker/unvanquished-mingw-system.Dockerfile b/docker/unvanquished-mingw-system.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:trixie-slim
+FROM docker.io/debian:trixie-slim
 
 ARG build_windows=true
 
diff --git a/docker/unvanquished-unizip-system.Dockerfile b/docker/unvanquished-unizip-system.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:trixie-slim
+FROM docker.io/debian:trixie-slim
 
 RUN mkdir /docker
 COPY docker/common.sh /docker
diff --git a/docker/unvanquished-vm-system.Dockerfile b/docker/unvanquished-vm-system.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:trixie-slim
+FROM docker.io/debian:trixie-slim
 
 ARG build_vm=true
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM debian:bullseye-slim`
	`1`	`+FROM docker.io/debian:bullseye-slim`
`2`	`2`
`3`	`3`	`# Toolchain dependencies for Unvanquished, Daemon, external_deps, or build-release`
`4`	`4`	`ENV TOOLCHAIN_DEPS=' \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM debian:trixie-slim`
	`1`	`+FROM docker.io/debian:trixie-slim`
`2`	`2`
`3`	`3`	`RUN mkdir /docker`
`4`	`4`	`COPY docker/common.sh /docker`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:focal`
	`1`	`+FROM docker.io/ubuntu:focal`
`2`	`2`
`3`	`3`	`ARG build_macos=true`
`4`	`4`