From a94fd14aff0bd00048b7b93927b20b13370b47a4 Mon Sep 17 00:00:00 2001 From: like Date: Fri, 27 May 2022 17:34:23 +0800 Subject: [PATCH] update .beagle.yml --- .beagle.yml | 121 ++-------------------------------------------------- go.mod | 50 ++++++++++++++++------ 2 files changed, 39 insertions(+), 132 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index 6830b09..56ca583 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -49,7 +49,7 @@ steps: settings: base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.12 dockerfile: .beagle/dockerfile - repo: gzga-jzapi/apaas-meshproxy + repo: gzgajzapi/apaas-meshproxy Version: "v3.0.6" channel: alpha args: "TARGETOS=linux,TARGETARCH=amd64" @@ -58,73 +58,6 @@ steps: from_secret: REGISTRY_USER registry_password: from_secret: REGISTRY_PASSWORD - - - name: deploy-cloud - image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0 - settings: - namespace: gzgajzapi - deployment: apaas-meshproxy - container: apaas-meshproxy - image: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-alpha - environment: - KUBERNETES_SERVER: - from_secret: KUBERNETES_SERVER - KUBERNETES_TOKEN: - from_secret: KUBERNETES_TOKEN - - - name: docker-arm64 - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 - volumes: - - name: docker-sock - path: /var/run/docker.sock - settings: - base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.12-arm64 - dockerfile: .beagle/dockerfile - repo: gzga-jzapi/apaas-meshproxy - Version: "v3.0.6" - channel: alpha-arm64 - args: "TARGETOS=linux,TARGETARCH=arm64" - registry: hub.wodcloud.com - registry_user: - from_secret: REGISTRY_USER - registry_password: - from_secret: REGISTRY_PASSWORD - - - name: docker-ppc64le - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 - volumes: - - name: docker-sock - path: /var/run/docker.sock - settings: - base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.12-ppc64le - dockerfile: .beagle/dockerfile - repo: gzga-jzapi/apaas-meshproxy - Version: "v3.0.6" - channel: alpha-ppc64le - args: "TARGETOS=linux,TARGETARCH=ppc64le" - registry: hub.wodcloud.com - registry_user: - from_secret: REGISTRY_USER - registry_password: - from_secret: REGISTRY_PASSWORD - - - name: docker-mips64le - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 - volumes: - - name: docker-sock - path: /var/run/docker.sock - settings: - base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.12-mips64le - dockerfile: .beagle/dockerfile - repo: gzga-jzapi/apaas-meshproxy - Version: "v3.0.6" - channel: alpha-mips64le - args: "TARGETOS=linux,TARGETARCH=mips64le" - registry: hub.wodcloud.com - registry_user: - from_secret: REGISTRY_USER - registry_password: - from_secret: REGISTRY_PASSWORD --- clone: @@ -154,56 +87,8 @@ steps: REGISTRY_PASSWORD: from_secret: REGISTRY_PASSWORD settings: - source: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-alpha - target: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6 - registry: hub.wodcloud.com - - - name: harbor-arm64 - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - volumes: - - name: docker-sock - path: /var/run/docker.sock - pull: always - environment: - REGISTRY_USER: - from_secret: REGISTRY_USER - REGISTRY_PASSWORD: - from_secret: REGISTRY_PASSWORD - settings: - source: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-alpha-arm64 - target: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-arm64 - registry: hub.wodcloud.com - - - name: harbor-ppc64le - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - volumes: - - name: docker-sock - path: /var/run/docker.sock - pull: always - environment: - REGISTRY_USER: - from_secret: REGISTRY_USER - REGISTRY_PASSWORD: - from_secret: REGISTRY_PASSWORD - settings: - source: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-alpha-ppc64le - target: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-ppc64le - registry: hub.wodcloud.com - - - name: harbor-mips64le - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - volumes: - - name: docker-sock - path: /var/run/docker.sock - pull: always - environment: - REGISTRY_USER: - from_secret: REGISTRY_USER - REGISTRY_PASSWORD: - from_secret: REGISTRY_PASSWORD - settings: - source: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-alpha-mips64le - target: hub.wodcloud.com/gzga-jzapi/apaas-meshproxy:v3.0.6-mips64le + source: hub.wodcloud.com/gzgajzapi/apaas-meshproxy:v3.0.6-alpha + target: hub.wodcloud.com/gzgajzapi/apaas-meshproxy:v3.0.6 registry: hub.wodcloud.com --- diff --git a/go.mod b/go.mod index 9c993d6..9fbd64b 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,25 @@ module gitlab.wodcloud.com/apaas-v3/apaas-meshproxy -go 1.12 +go 1.17 require ( - github.com/BurntSushi/toml v0.3.1 // indirect github.com/Chain-Zhang/pinyin v0.1.3 + github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19 + github.com/gin-gonic/gin v1.6.3 + github.com/go-redis/redis v6.15.9+incompatible + github.com/go-sql-driver/mysql v1.6.0 + github.com/lib/pq v1.10.0 + github.com/natefinch/lumberjack v2.0.0+incompatible + github.com/sirupsen/logrus v1.8.1 + github.com/spf13/cast v1.3.1 + github.com/spf13/pflag v1.0.5 + github.com/vulcand/oxy v1.2.0 + github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31 + github.com/xormplus/xorm v0.0.0-20210107091022-175d736afaae +) + +require ( + github.com/BurntSushi/toml v0.3.1 // indirect github.com/Chronokeeper/anyxml v0.0.0-20160530174208-54457d8e98c6 // indirect github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect github.com/CloudyKit/jet v2.1.2+incompatible // indirect @@ -13,24 +28,31 @@ require ( github.com/bndr/gotabulate v1.1.2 // indirect github.com/clbanning/mxj v1.8.4 // indirect github.com/fatih/structs v1.1.0 // indirect - github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19 - github.com/gin-gonic/gin v1.6.3 - github.com/go-redis/redis v6.15.9+incompatible - github.com/go-sql-driver/mysql v1.6.0 - github.com/lib/pq v1.10.0 + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.13.0 // indirect + github.com/go-playground/universal-translator v0.17.0 // indirect + github.com/go-playground/validator/v10 v10.2.0 // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect + github.com/gorilla/websocket v1.4.2 // indirect + github.com/json-iterator/go v1.1.9 // indirect + github.com/leodido/go-urn v1.2.0 // indirect + github.com/mailgun/timetools v0.0.0-20141028012446-7e6055773c51 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect github.com/mattn/go-sqlite3 v1.14.6 // indirect - github.com/natefinch/lumberjack v2.0.0+incompatible + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect github.com/onsi/ginkgo v1.16.1 // indirect github.com/onsi/gomega v1.11.0 // indirect - github.com/sirupsen/logrus v1.8.1 - github.com/spf13/cast v1.3.1 - github.com/spf13/pflag v1.0.5 github.com/syndtr/goleveldb v1.0.0 // indirect github.com/tealeg/xlsx v1.0.5 // indirect - github.com/vulcand/oxy v1.2.0 + github.com/ugorji/go/codec v1.1.7 // indirect github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be // indirect - github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31 - github.com/xormplus/xorm v0.0.0-20210107091022-175d736afaae + golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect + golang.org/x/sys v0.0.0-20210112080510-489259a85091 // indirect + google.golang.org/protobuf v1.23.0 // indirect gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) -- 2.26.0