arm64

build/docker/pcm/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine
+FROM arm64v8/alpine
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 RUN apk add --update curl && rm -rf /var/cache/apk/*

build/docker/pcm/build.sh

@@ -3,7 +3,7 @@ TAG=3.0
 # 镜像私有仓库
 REGISTRY=harbor.sxidc.com/yfhub
 # 镜像名称
-NAME=cabinet
+NAME=arm64/pcm
 # 私有仓库镜像名称 必须是这种格式
 IMAGE_NAME=$REGISTRY/$NAME
 
@@ -16,3 +16,5 @@ docker push $IMAGE_NAME:$TAG
 
 # docker rmi -f $IMAGE_NAME:$TAG
 # docker rmi -f $IMAGE_NAME:latest
+
+# CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o build/docker/pcm/pcm-server  cmd/pcm-server/main.go

build/docker/pcm/docker-compose.yaml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   duyong_cabinet:
-    image: harbor.sxidc.com/yfhub/pcm:3.0
+    image: harbor.sxidc.com/yfhub/arm64/pcm:3.0
     container_name: duyong_cabinet
     ports:
       - "9099:9099"

internal/pcmserver/app.go

@@ -1,10 +1,10 @@
 package pcmserver
 
 import (
-	"dy-admin/internal/pcmserver/config"
 	"dy-admin/internal/pcmserver/options"
 	"dy-admin/pkg/app"
 	"dy-admin/pkg/log"
+	"fmt"
 )
 
 const commandDesc = `pcm(phone cabinet manager)  system command description`
@@ -28,11 +28,7 @@ func run(opts *options.Options) app.RunFunc {
 		log.Init(opts.LogOptions)
 		defer log.Flush()
 
-		cfg, err := config.CreateConfigFromOptions(opts)
-		if err != nil {
-			return err
-		}
-
-		return Run(cfg)
+		fmt.Println("run...")
+		return nil
 	}
 }

scripts/make-rules/golang.mk

@@ -4,7 +4,7 @@
 #
 
 GO :=go
-GO_SUPPORTED_VERSIONS ?= 1.13|1.14|1.15|1.16|1.17|1.18|1.19
+GO_SUPPORTED_VERSIONS ?= 1.13|1.14|1.15|1.16|1.17|1.18|1.19|1.20|1.21|1.22
 GO_LDFLAGS += -X $(VERSION_PACKAGE).GitVersion=$(VERSION) \
 	-X $(VERSION_PACKAGE).GitCommit=$(GIT_COMMIT) \
 	-X $(VERSION_PACKAGE).GitTreeState=$(GIT_TREE_STATE) \