v1.7.9

.beagle.yml

@@ -118,24 +118,31 @@ steps:
       registry_password:
         from_secret: REGISTRY_PASSWORD_ALIYUN
 
-  # - name: docker-loong64
-  #   image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
-  #   volumes:
-  #     - name: docker
-  #       path: /var/run/docker.sock
-  #   settings:
-  #     dockerfile: .beagle/dockerfile
-  #     base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3-amd64
-  #     cwd: _output
-  #     repo: wod/containerd
-  #     version: v1.7.9
-  #     channel: loong64
-  #     args: 'TARGETOS=linux,TARGETARCH=loong64'
-  #     registry: registry.cn-qingdao.aliyuncs.com
-  #     registry_user:
-  #       from_secret: REGISTRY_USER_ALIYUN
-  #     registry_password:
-  #       from_secret: REGISTRY_PASSWORD_ALIYUN
+  - name: golang
+    image: registry.cn-qingdao.aliyuncs.com/wod/golang:1.21-loongnix
+    environment:
+      VERSION: v1.7.9-beagle
+    commands:
+      - bash ./.beagle/build-loong64.sh
+
+  - name: docker-loong64
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    settings:
+      dockerfile: .beagle/dockerfile
+      base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3-amd64
+      cwd: _output
+      repo: wod/containerd
+      version: v1.7.9
+      channel: loong64
+      args: 'TARGETOS=linux,TARGETARCH=loong64'
+      registry: registry.cn-qingdao.aliyuncs.com
+      registry_user:
+        from_secret: REGISTRY_USER_ALIYUN
+      registry_password:
+        from_secret: REGISTRY_PASSWORD_ALIYUN
 
 ---
 kind: secret

.beagle/README.md

@@ -20,6 +20,14 @@ docker run -it --rm \
 -e VERSION=v1.7.9-beagle \
 registry.cn-qingdao.aliyuncs.com/wod/golang:1.21 \
 bash .beagle/build.sh
+
+# golang build loong64
+docker run -it --rm \
+-v $PWD/:/go/src/github.com/containerd/containerd \
+-w /go/src/github.com/containerd/containerd \
+-e VERSION=v1.7.9-beagle \
+registry.cn-qingdao.aliyuncs.com/wod/golang:1.21-loongnix \
+bash .beagle/build-loong64.sh
 ```
 
 ## test

.beagle/build-loong64.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -ex
+
+apt-get update
+apt-get install -y --no-install-recommends libbtrfs-dev
+
+export GO111MODULE=off
+export STATIC=true
+export BUILDTAGS="seccomp"
+
+git apply .beagle/v1.7-add-loong64-support.patch
+export GOARCH=loong64
+export CC=loongarch64-linux-gnu-gcc
+make
+mkdir -p _output/linux-$GOARCH/
+mv bin/* _output/linux-$GOARCH/
+git apply -R .beagle/v1.7-add-loong64-support.patch

.beagle/build.sh

@@ -30,12 +30,4 @@ export GOARCH=mips64le
 export CC=mips64el-linux-gnuabi64-gcc
 make
 mkdir -p _output/linux-$GOARCH/
-mv bin/* _output/linux-$GOARCH/
-
-# git apply .beagle/v1.7-add-loong64-support.patch
-# export GOARCH=loong64
-# export CC=loongarch64-linux-gnu-gcc
-# make
-# mkdir -p _output/linux-$GOARCH/
-# mv bin/* _output/linux-$GOARCH/
-# git apply -R .beagle/v1.7-add-loong64-support.patch
+mv bin/* _output/linux-$GOARCH/