git: bfa14ad08796 - stable/14 - release: fix architecture for OCI images

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Doug Rabson <dfr_at_FreeBSD.org>
Date: Sun, 19 Jan 2025 10:31:48 UTC

The branch stable/14 has been updated by dfr:

URL: https://cgit.FreeBSD.org/src/commit/?id=bfa14ad08796f33435ad57f393725ca56fcbfce5

commit bfa14ad08796f33435ad57f393725ca56fcbfce5
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2024-12-04 13:23:58 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2025-01-19 10:31:02 +0000

    release: fix architecture for OCI images
    
    PR:                     283260
    MFC after:              3 days
    Differential Revision:  https://reviews.freebsd.org/D48051
    
    (cherry picked from commit e2fc29e53986c69ac91d40e7f1ef8fbca317771e)
---
 release/scripts/make-oci-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh
index a139a38d1930..6180ed9d53b4 100644
--- a/release/scripts/make-oci-image.sh
+++ b/release/scripts/make-oci-image.sh
@@ -56,7 +56,7 @@ else
 	base_image=scratch
 fi
 
-c=$(buildah from ${base_image})
+c=$(buildah from --arch ${arch} ${base_image})
 m=$(buildah mount $c)
 oci_image_build
 buildah unmount $c