From 4317bb767160443d0d9b89dcf3ff26660ac54a90 Mon Sep 17 00:00:00 2001 From: Adam Chalkley Date: Fri, 9 Feb 2024 07:18:11 -0600 Subject: [PATCH] Add architecture specification to all Dockerfiles Add `amd64/` prefix to all Dockerfiles which do not already explicitly use the `i386/` prefix. refs GH-1344 --- mirror/1.14/Dockerfile | 2 +- mirror/1.15/Dockerfile | 2 +- mirror/1.16/Dockerfile | 2 +- mirror/1.17/Dockerfile | 2 +- mirror/1.18/Dockerfile | 2 +- mirror/1.19/Dockerfile | 2 +- mirror/1.20/Dockerfile | 2 +- mirror/1.21/Dockerfile | 2 +- oldstable/build/alpine-x64/Dockerfile | 2 +- oldstable/build/release/Dockerfile | 2 +- oldstable/combined/Dockerfile | 2 +- stable/build/alpine-x64/Dockerfile | 2 +- stable/build/cgo-mingw-w64/Dockerfile | 2 +- stable/build/release/Dockerfile | 2 +- stable/combined/Dockerfile | 2 +- unstable/build/alpine-x64/Dockerfile | 2 +- unstable/build/release/Dockerfile | 2 +- unstable/combined/Dockerfile | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mirror/1.14/Dockerfile b/mirror/1.14/Dockerfile index d0dc599a..f7d68a2c 100644 --- a/mirror/1.14/Dockerfile +++ b/mirror/1.14/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.14.15-buster +FROM amd64/golang:1.14.15-buster # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.15/Dockerfile b/mirror/1.15/Dockerfile index c7d9735c..dc043540 100644 --- a/mirror/1.15/Dockerfile +++ b/mirror/1.15/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.15.15-buster +FROM amd64/golang:1.15.15-buster # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.16/Dockerfile b/mirror/1.16/Dockerfile index 7a8d83b0..78396f61 100644 --- a/mirror/1.16/Dockerfile +++ b/mirror/1.16/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.16.15-bullseye +FROM amd64/golang:1.16.15-bullseye # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.17/Dockerfile b/mirror/1.17/Dockerfile index 768f431c..49fc634a 100644 --- a/mirror/1.17/Dockerfile +++ b/mirror/1.17/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.17.13-bullseye +FROM amd64/golang:1.17.13-bullseye # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.18/Dockerfile b/mirror/1.18/Dockerfile index 5c869f18..2ea8e568 100644 --- a/mirror/1.18/Dockerfile +++ b/mirror/1.18/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.18.10-bullseye +FROM amd64/golang:1.18.10-bullseye # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.19/Dockerfile b/mirror/1.19/Dockerfile index 86bba14e..c3542516 100644 --- a/mirror/1.19/Dockerfile +++ b/mirror/1.19/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.19.13-bookworm +FROM amd64/golang:1.19.13-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.20/Dockerfile b/mirror/1.20/Dockerfile index b25de890..9ec94081 100644 --- a/mirror/1.20/Dockerfile +++ b/mirror/1.20/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.14-bookworm +FROM amd64/golang:1.20.14-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/mirror/1.21/Dockerfile b/mirror/1.21/Dockerfile index ce400c5c..8f221acb 100644 --- a/mirror/1.21/Dockerfile +++ b/mirror/1.21/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.21.7-bookworm +FROM amd64/golang:1.21.7-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/oldstable/build/alpine-x64/Dockerfile b/oldstable/build/alpine-x64/Dockerfile index 6c11fb67..36d8d757 100644 --- a/oldstable/build/alpine-x64/Dockerfile +++ b/oldstable/build/alpine-x64/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.14-alpine3.18 +FROM amd64/golang:1.20.14-alpine3.18 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/oldstable/build/release/Dockerfile b/oldstable/build/release/Dockerfile index 13a7e61f..bdef78ba 100644 --- a/oldstable/build/release/Dockerfile +++ b/oldstable/build/release/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.14-bookworm +FROM amd64/golang:1.20.14-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/oldstable/combined/Dockerfile b/oldstable/combined/Dockerfile index be803e73..bdc1479c 100644 --- a/oldstable/combined/Dockerfile +++ b/oldstable/combined/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.20.14-bookworm +FROM amd64/golang:1.20.14-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/stable/build/alpine-x64/Dockerfile b/stable/build/alpine-x64/Dockerfile index 8bf90415..cb0a6478 100644 --- a/stable/build/alpine-x64/Dockerfile +++ b/stable/build/alpine-x64/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.21.7-alpine3.18 +FROM amd64/golang:1.21.7-alpine3.18 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/stable/build/cgo-mingw-w64/Dockerfile b/stable/build/cgo-mingw-w64/Dockerfile index 68eaf1d1..6e3d1106 100644 --- a/stable/build/cgo-mingw-w64/Dockerfile +++ b/stable/build/cgo-mingw-w64/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.21.7-bookworm +FROM amd64/golang:1.21.7-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/stable/build/release/Dockerfile b/stable/build/release/Dockerfile index d9d67f49..1830a65f 100644 --- a/stable/build/release/Dockerfile +++ b/stable/build/release/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.21.7-bookworm +FROM amd64/golang:1.21.7-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/stable/combined/Dockerfile b/stable/combined/Dockerfile index 613967d9..dd237296 100644 --- a/stable/combined/Dockerfile +++ b/stable/combined/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.21.7-bookworm +FROM amd64/golang:1.21.7-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/unstable/build/alpine-x64/Dockerfile b/unstable/build/alpine-x64/Dockerfile index a9f92e1f..c37d9c63 100644 --- a/unstable/build/alpine-x64/Dockerfile +++ b/unstable/build/alpine-x64/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.22.0-alpine3.18 +FROM amd64/golang:1.22.0-alpine3.18 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/unstable/build/release/Dockerfile b/unstable/build/release/Dockerfile index 3dda3883..53d88466 100644 --- a/unstable/build/release/Dockerfile +++ b/unstable/build/release/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.22.0-bookworm +FROM amd64/golang:1.22.0-bookworm # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci" diff --git a/unstable/combined/Dockerfile b/unstable/combined/Dockerfile index 2e5a60e4..ecc5ac08 100644 --- a/unstable/combined/Dockerfile +++ b/unstable/combined/Dockerfile @@ -7,7 +7,7 @@ # https://hub.docker.com/_/golang -FROM golang:1.22.0-bookworm as builder +FROM amd64/golang:1.22.0-bookworm as builder # Explicitly disable automatic fetching of Go toolchains newer than the # version explicitly provided by this container image. @@ -106,7 +106,7 @@ RUN echo "Installing golangci-lint@${GOLANGCI_LINT_VERSION}" \ && golangci-lint --version -FROM golang:1.22.0-bookworm as final +FROM amd64/golang:1.22.0-bookworm as final # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package LABEL org.opencontainers.image.source="https://github.com/atc0005/go-ci"