From 5959ca901d6a56dcb96a295f4b4d33615e61b5f6 Mon Sep 17 00:00:00 2001 From: Carl Montanari Date: Mon, 20 Nov 2023 19:06:05 -0800 Subject: [PATCH] chore: specify platform in final images now that i have not x86 :p --- .develop/dev.Dockerfile | 2 +- .develop/devspace.yaml | 2 +- build/clabverter.Dockerfile | 2 +- build/launcher.Dockerfile | 2 +- build/manager.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.develop/dev.Dockerfile b/.develop/dev.Dockerfile index 6551436c..13af965d 100644 --- a/.develop/dev.Dockerfile +++ b/.develop/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-bookworm +FROM --platform=linux/amd64 golang:1.21-bookworm RUN set -x && apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y \ ca-certificates wget jq procps curl vim inetutils-ping binutils && \ diff --git a/.develop/devspace.yaml b/.develop/devspace.yaml index 1ade3355..7b8c58a7 100644 --- a/.develop/devspace.yaml +++ b/.develop/devspace.yaml @@ -18,7 +18,7 @@ vars: LAUNCHER_IMAGE: ${REGISTRY}/${CLABERNETES}-launcher CLABVERTER_IMAGE: ${REGISTRY}/clabverter - # always build w/ 0.0.0 -- overriden for actual releases by release profile. for "normal" builds + # always build w/ 0.0.0 -- overridden for actual releases by release profile. for "normal" builds # (not releases) we'll do VERSION-HASH, for releases we'll just override to have version tag. VERSION: 0.0.0 COMMIT_HASH: $(git describe --always --abbrev=8) diff --git a/build/clabverter.Dockerfile b/build/clabverter.Dockerfile index c984354d..0d243487 100644 --- a/build/clabverter.Dockerfile +++ b/build/clabverter.Dockerfile @@ -25,7 +25,7 @@ RUN CGO_ENABLED=0 \ build/clabverter \ main.go -FROM gcr.io/distroless/static-debian12:nonroot +FROM --platform=linux/amd64 gcr.io/distroless/static-debian12:nonroot WORKDIR /clabernetes COPY --from=builder --chown=nonroot:nonroot /clabernetes/work /clabernetes/work diff --git a/build/launcher.Dockerfile b/build/launcher.Dockerfile index aeace414..bd964e00 100644 --- a/build/launcher.Dockerfile +++ b/build/launcher.Dockerfile @@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 \ build/manager \ main.go -FROM debian:bookworm-slim +FROM --platform=linux/amd64 debian:bookworm-slim ARG CONTAINERLAB_VERSION="0.48.*" ARG NERDCTL_VERSION="1.7.0" diff --git a/build/manager.Dockerfile b/build/manager.Dockerfile index fc4ac980..021043e6 100644 --- a/build/manager.Dockerfile +++ b/build/manager.Dockerfile @@ -34,7 +34,7 @@ RUN CGO_ENABLED=0 \ build/manager \ main.go -FROM gcr.io/distroless/static-debian12:nonroot +FROM --platform=linux/amd64 gcr.io/distroless/static-debian12:nonroot WORKDIR /clabernetes COPY --from=builder --chown=nonroot:nonroot /clabernetes/certificates /clabernetes/certificates