loong64 support

Makefile.common.mk

@@ -8,7 +8,7 @@ endif
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.19.0-go-1.21.10-0
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.21.0-go-1.23.4-0
 DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.21.10-0
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))

build/docker/Dockerfile.onecloud-base-3-21-0

@@ -0,0 +1,13 @@
+FROM registry.cn-beijing.aliyuncs.com/zexi/alpine:3.21.0
+
+MAINTAINER "Zexi Li <[email protected]>"
+
+ENV TZ UTC
+
+RUN mkdir -p /opt/yunion/bin
+
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+
+RUN apk update && \
+    apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
+    rm -rf /var/cache/apk/*

build/docker/Dockerfile.region

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.21.0-0
 
 COPY ./build/region/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/region /opt/yunion/bin/region

build/docker/Makefile

@@ -1,6 +1,7 @@
 REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
 DOCKER_BUILD = docker build -t $(REGISTRY)
 DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
+DOCKER_BUILDX_WITH_LOONG64 = docker buildx build --platform linux/arm64,linux/amd64,linux/loong64 --push -t $(REGISTRY)
 
 
 debian10-base:
@@ -9,11 +10,14 @@ debian10-base:
 
 ONECLOUD_BASE_VERSION = v0.3-3.13.5
 ONECLOUD_BASE_VERSION_3-15-4 = v3.15.4-0
+ONECLOUD_BASE_VERSION_3-21-0 = v3.21.0-0
 
 onecloud-base:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
 onecloud-base-3-15-4:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 .
+onecloud-base-3-21-0:
+	$(DOCKER_BUILDX_WITH_LOONG64)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-21-0) -f ./Dockerfile.onecloud-base-3-21-0 .
 
 ANSIBLESERVER_BASE = v1.1.2
 

scripts/docker_push.sh

@@ -313,7 +313,7 @@ for component in $COMPONENTS; do
 
     case "$ARCH" in
     all)
-        for arch in "arm64" "amd64"; do
+        for arch in "arm64" "amd64" "loong64"; do
             general_build $component $arch "true"
         done
         make_manifest_image $component