docker: add riscv64 to container image architectures
Add riscv64 to the GOARCH list passed to mkctr for all Docker image builds. Go already cross-compiles for riscv64, so this just adds the architecture to the container manifest. Updates #17812 Signed-off-by: Bruno Verachten <gounthar@gmail.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
edb2be1a01
commit
4c0f488389
@@ -38,6 +38,7 @@ TARGET="${TARGET:-${DEFAULT_TARGET}}"
|
|||||||
TAGS="${TAGS:-${DEFAULT_TAGS}}"
|
TAGS="${TAGS:-${DEFAULT_TAGS}}"
|
||||||
BASE="${BASE:-${DEFAULT_BASE}}"
|
BASE="${BASE:-${DEFAULT_BASE}}"
|
||||||
PLATFORM="${PLATFORM:-}" # default to all platforms
|
PLATFORM="${PLATFORM:-}" # default to all platforms
|
||||||
|
GOARCH="${GOARCH:-arm,arm64,amd64,386,riscv64}"
|
||||||
FILES="${FILES:-}" # default to no extra files
|
FILES="${FILES:-}" # default to no extra files
|
||||||
# OCI annotations that will be added to the image.
|
# OCI annotations that will be added to the image.
|
||||||
# https://github.com/opencontainers/image-spec/blob/main/annotations.md
|
# https://github.com/opencontainers/image-spec/blob/main/annotations.md
|
||||||
@@ -62,6 +63,7 @@ case "$TARGET" in
|
|||||||
--repos="${REPOS}" \
|
--repos="${REPOS}" \
|
||||||
--push="${PUSH}" \
|
--push="${PUSH}" \
|
||||||
--target="${PLATFORM}" \
|
--target="${PLATFORM}" \
|
||||||
|
--goarch="${GOARCH}" \
|
||||||
--annotations="${ANNOTATIONS}" \
|
--annotations="${ANNOTATIONS}" \
|
||||||
--files="${FILES}" \
|
--files="${FILES}" \
|
||||||
/usr/local/bin/containerboot
|
/usr/local/bin/containerboot
|
||||||
@@ -81,6 +83,7 @@ case "$TARGET" in
|
|||||||
--repos="${REPOS}" \
|
--repos="${REPOS}" \
|
||||||
--push="${PUSH}" \
|
--push="${PUSH}" \
|
||||||
--target="${PLATFORM}" \
|
--target="${PLATFORM}" \
|
||||||
|
--goarch="${GOARCH}" \
|
||||||
--annotations="${ANNOTATIONS}" \
|
--annotations="${ANNOTATIONS}" \
|
||||||
--files="${FILES}" \
|
--files="${FILES}" \
|
||||||
/usr/local/bin/operator
|
/usr/local/bin/operator
|
||||||
@@ -100,6 +103,7 @@ case "$TARGET" in
|
|||||||
--repos="${REPOS}" \
|
--repos="${REPOS}" \
|
||||||
--push="${PUSH}" \
|
--push="${PUSH}" \
|
||||||
--target="${PLATFORM}" \
|
--target="${PLATFORM}" \
|
||||||
|
--goarch="${GOARCH}" \
|
||||||
--annotations="${ANNOTATIONS}" \
|
--annotations="${ANNOTATIONS}" \
|
||||||
--files="${FILES}" \
|
--files="${FILES}" \
|
||||||
/usr/local/bin/k8s-nameserver
|
/usr/local/bin/k8s-nameserver
|
||||||
@@ -119,6 +123,7 @@ case "$TARGET" in
|
|||||||
--repos="${REPOS}" \
|
--repos="${REPOS}" \
|
||||||
--push="${PUSH}" \
|
--push="${PUSH}" \
|
||||||
--target="${PLATFORM}" \
|
--target="${PLATFORM}" \
|
||||||
|
--goarch="${GOARCH}" \
|
||||||
--annotations="${ANNOTATIONS}" \
|
--annotations="${ANNOTATIONS}" \
|
||||||
--files="${FILES}" \
|
--files="${FILES}" \
|
||||||
/usr/local/bin/tsidp
|
/usr/local/bin/tsidp
|
||||||
@@ -138,6 +143,7 @@ case "$TARGET" in
|
|||||||
--repos="${REPOS}" \
|
--repos="${REPOS}" \
|
||||||
--push="${PUSH}" \
|
--push="${PUSH}" \
|
||||||
--target="${PLATFORM}" \
|
--target="${PLATFORM}" \
|
||||||
|
--goarch="${GOARCH}" \
|
||||||
--annotations="${ANNOTATIONS}" \
|
--annotations="${ANNOTATIONS}" \
|
||||||
--files="${FILES}" \
|
--files="${FILES}" \
|
||||||
/usr/local/bin/k8s-proxy
|
/usr/local/bin/k8s-proxy
|
||||||
|
|||||||
Reference in New Issue
Block a user