diff --git a/build/docker/Makefile b/build/docker/Makefile index ec19e7eaaa..39131c7140 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -71,18 +71,6 @@ glance-base-3-22-2: $(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION_3-22-2) -f ./Dockerfile.glance-base . -HOST_IMAGE_VERSION ?= v1.0.2 -HOST_IMAGE_NAME = $(REGISTRY)/host-image:$(HOST_IMAGE_VERSION) -host-image: - docker pull $(HOST_IMAGE_NAME)-amd64 --platform amd64 - docker pull $(HOST_IMAGE_NAME)-arm64 --platform arm64 - docker manifest create $(HOST_IMAGE_NAME) \ - $(HOST_IMAGE_NAME)-amd64 \ - $(HOST_IMAGE_NAME)-arm64 - docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-amd64 --arch amd64 - docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-arm64 --arch arm64 - docker manifest push $(HOST_IMAGE_NAME) - LBAGENT_BASE_VERSION = v0.0.5 lbagent-base: $(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base . diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 0a69259bb7..c14c9e1dfa 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -142,7 +142,7 @@ get_image_name() { local arch=$2 local is_all_arch=$3 local img_name="$REGISTRY/$component:$TAG" - if [[ "$is_all_arch" == "true" || "$arch" == arm64 || "$arch" == riscv64 || "$component" == host-image ]]; then + if [[ "$is_all_arch" == "true" || "$arch" == arm64 || "$arch" == riscv64 ]]; then img_name="${img_name}-$arch" fi echo $img_name @@ -296,6 +296,9 @@ show_update_cmd() { 'host-health') spec='hostagent/HostHealth' ;; + 'host-image') + spec='hostimage' + ;; 'region') spec='regionServer' ;; @@ -352,8 +355,5 @@ for component in $COMPONENTS; do if [[ $component == *cli ]]; then continue fi - if [[ $component == host-image ]]; then - continue - fi show_update_cmd $component $ARCH done