jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-05 02:27:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Support pushing multi-arch images to a custom image registry (#1815)

Browse Source
This commit is contained in:
Kent Dong
2025-02-26 21:15:53 +08:00
committed by GitHub
parent d3afe345ad
commit 45fdd95a9c
6 changed files with 293 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/hack/build-envoy.sh
View File

@@ -30,9 +30,11 @@ fi
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${ROOT}/external/package,destination=/home/package "
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${ROOT}/external/envoy,destination=/home/envoy "
BUILD_TOOLS_IMG=${BUILD_TOOLS_IMG:-"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/build-tools:release-1.19-ef344298e65eeb2d9e2d07b87eb4e715c2def613"}
BUILD_WITH_CONTAINER=1 \
CONDITIONAL_HOST_MOUNTS=${CONDITIONAL_HOST_MOUNTS} \
BUILD_ENVOY_BINARY_ONLY=1 \
DOCKER_RUN_OPTIONS="--user root -e HTTP_PROXY -e HTTPS_PROXY" \
IMG=higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/build-tools-proxy:release-1.19-ef344298e65eeb2d9e2d07b87eb4e715c2def613 \
IMG=${BUILD_TOOLS_IMG} \
make test_release

24
tools/hack/build-istio-image.sh
View File

@@ -25,14 +25,34 @@ CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${ROOT}/external/package,dest
DOCKER_RUN_OPTIONS+="-e HTTP_PROXY -e HTTPS_PROXY"
BUILD_TOOLS_IMG=${BUILD_TOOLS_IMG:-"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/build-tools:release-1.19-ef344298e65eeb2d9e2d07b87eb4e715c2def613"}
ORIGINAL_HUB=${HUB}
echo "IMG_URL=$IMG_URL"
if [ -n "$IMG_URL" ]; then
TAG=${IMG_URL#*:}
HUB=${IMG_URL%:*}
HUB=${HUB%/*}
if [ "$TAG" == "${IMG_URL}" ]; then
TAG=latest
fi
fi
echo "HUB=$HUB"
echo "TAG=$TAG"
GOOS_LOCAL=linux TARGET_OS=linux TARGET_ARCH=${TARGET_ARCH} \
ISTIO_ENVOY_LINUX_RELEASE_URL=${ISTIO_ENVOY_LINUX_RELEASE_URL} \
BUILD_WITH_CONTAINER=1 \
USE_REAL_USER=${USE_REAL_USER:-0} \
CONDITIONAL_HOST_MOUNTS=${CONDITIONAL_HOST_MOUNTS} \
DOCKER_BUILD_VARIANTS=default DOCKER_TARGETS="${DOCKER_TARGETS}" \
ISTIO_BASE_REGISTRY="${HUB}" \
ISTIO_BASE_REGISTRY="${ORIGINAL_HUB}" \
BASE_VERSION="${HIGRESS_BASE_VERSION}" \
DOCKER_RUN_OPTIONS=${DOCKER_RUN_OPTIONS} \
IMG=higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/build-tools:release-1.19-ef344298e65eeb2d9e2d07b87eb4e715c2def613 \
HUB="${HUB}" \
TAG="${TAG}" \
IMG=${BUILD_TOOLS_IMG} \
make "$@"

6
tools/hack/build-istio-pilot.sh
View File

@@ -19,7 +19,9 @@ set -euo pipefail
source "$(dirname -- "$0")/setup-istio-env.sh"
cd ${ROOT}/external/istio
rm -rf out/linux_${TARGET_ARCH};
rm -rf out/linux_${TARGET_ARCH};
BUILD_TOOLS_IMG=${BUILD_TOOLS_IMG:-"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/build-tools:release-1.19-ef344298e65eeb2d9e2d07b87eb4e715c2def613"}
GOOS_LOCAL=linux TARGET_OS=linux TARGET_ARCH=${TARGET_ARCH} \
ISTIO_ENVOY_LINUX_RELEASE_URL=${ISTIO_ENVOY_LINUX_RELEASE_URL} \
@@ -28,5 +30,5 @@ GOOS_LOCAL=linux TARGET_OS=linux TARGET_ARCH=${TARGET_ARCH} \
ISTIO_BASE_REGISTRY="${HUB}" \
BASE_VERSION="${HIGRESS_BASE_VERSION}" \
DOCKER_RUN_OPTIONS="--user root -e HTTP_PROXY -e HTTPS_PROXY" \
IMG=higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/build-tools:release-1.19-ef344298e65eeb2d9e2d07b87eb4e715c2def613 \
IMG=${BUILD_TOOLS_IMG} \
make build-linux