Skip to content

[WIP] build: loong64 image support #21786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] build: loong64 image support #21786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
13 changes: 13 additions & 0 deletions build/docker/Dockerfile.onecloud-base-3-21-0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/*
2 changes: 1 addition & 1 deletion build/docker/Dockerfile.region
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions build/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading