From fe269ab1dc8d04daf74c81e758f2c44ed72e4fce Mon Sep 17 00:00:00 2001 From: Kong Team Gateway Bot <98048765+team-gateway-bot@users.noreply.github.com> Date: Tue, 24 Oct 2023 12:58:04 +0800 Subject: [PATCH] fix(build): correctly set manifest for multiarch images (#11809) (#11812) Behaviour change from https://github.com/Kong/kong/pull/11594 Fix KAG-2855 Fix #11776 (cherry picked from commit a3c249d820b0bda2af2ad81a2d7b3d8c72719e93) Co-authored-by: Wangchong Zhou --- build/dockerfiles/apk.Dockerfile | 2 +- build/dockerfiles/deb.Dockerfile | 2 +- build/dockerfiles/rpm.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/dockerfiles/apk.Dockerfile b/build/dockerfiles/apk.Dockerfile index 808b89f3aa25..bea623c9cdd2 100644 --- a/build/dockerfiles/apk.Dockerfile +++ b/build/dockerfiles/apk.Dockerfile @@ -1,5 +1,5 @@ ARG KONG_BASE_IMAGE=alpine:3.16 -FROM $KONG_BASE_IMAGE +FROM --platform=$TARGETPLATFORM $KONG_BASE_IMAGE LABEL maintainer="Kong Docker Maintainers (@team-gateway-bot)" diff --git a/build/dockerfiles/deb.Dockerfile b/build/dockerfiles/deb.Dockerfile index 7a45d2dcfbf1..75c2252f875a 100644 --- a/build/dockerfiles/deb.Dockerfile +++ b/build/dockerfiles/deb.Dockerfile @@ -1,5 +1,5 @@ ARG KONG_BASE_IMAGE=debian:bullseye-slim -FROM $KONG_BASE_IMAGE +FROM --platform=$TARGETPLATFORM $KONG_BASE_IMAGE LABEL maintainer="Kong Docker Maintainers (@team-gateway-bot)" diff --git a/build/dockerfiles/rpm.Dockerfile b/build/dockerfiles/rpm.Dockerfile index 9dd4b87ebf02..958140c98302 100644 --- a/build/dockerfiles/rpm.Dockerfile +++ b/build/dockerfiles/rpm.Dockerfile @@ -1,5 +1,5 @@ ARG KONG_BASE_IMAGE=redhat/ubi8 -FROM $KONG_BASE_IMAGE +FROM --platform=$TARGETPLATFORM $KONG_BASE_IMAGE LABEL maintainer="Kong Docker Maintainers (@team-gateway-bot)"