onexstack · tsukiyoz · Apr 7, 2024 · Apr 8, 2024 · Apr 8, 2024 · Apr 9, 2024
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-go1.22.2
+1.22.2
diff --git a/.todo.md b/.todo.md
@@ -34,7 +34,9 @@
 [?] loft 调研
 [?] onex-apiserver 后端对接 ES
 [?] 诊断平台
-
+[?] GraphQL API
+[?] 添加状态机
+[?] 场景：Webhook 展示修改镜像地址？？
 ---
 
 [?] 创建一个项目开发者社区网站 + 群？？？

diff --git a/build/docker/gen-docs/Dockerfile b/build/docker/gen-docs/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-docs binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/gen-docs/Dockerfile.multistage b/build/docker/gen-docs/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-docs binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/gen-man/Dockerfile b/build/docker/gen-man/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-man binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/gen-man/Dockerfile.multistage b/build/docker/gen-man/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-man binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/gen-onex-docs/Dockerfile b/build/docker/gen-onex-docs/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-onex-docs binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/gen-onex-docs/Dockerfile.multistage b/build/docker/gen-onex-docs/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-onex-docs binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/gen-onex-gorm-model/Dockerfile b/build/docker/gen-onex-gorm-model/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-onex-gorm-model binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/gen-onex-gorm-model/Dockerfile.multistage b/build/docker/gen-onex-gorm-model/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-onex-gorm-model binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/gen-yaml/Dockerfile b/build/docker/gen-yaml/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the gen-yaml binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/gen-yaml/Dockerfile.multistage b/build/docker/gen-yaml/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the gen-yaml binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/onex-blc/Dockerfile b/build/docker/onex-blc/Dockerfile
diff --git a/build/docker/onex-blc/Dockerfile.multistage b/build/docker/onex-blc/Dockerfile.multistage
diff --git a/build/docker/onex-chatroom/Dockerfile b/build/docker/onex-chatroom/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex-chatroom binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/onex-chatroom/Dockerfile.multistage b/build/docker/onex-chatroom/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex-chatroom binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/onex-fake-miner/Dockerfile b/build/docker/onex-fake-miner/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex-fake-miner binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is alpine:3.17
-ARG prod_image=alpine:3.17
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/onex-fake-miner/Dockerfile.multistage b/build/docker/onex-fake-miner/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex-fake-miner binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is alpine:3.17
-ARG prod_image=alpine:3.17
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/onex-oss-center/Dockerfile b/build/docker/onex-oss-center/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex-oss-center binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/onex-oss-center/Dockerfile.multistage b/build/docker/onex-oss-center/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex-oss-center binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/build/docker/onex/Dockerfile b/build/docker/onex/Dockerfile
@@ -9,8 +9,8 @@
 
 # Build the onex binary
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 FROM ${prod_image}
 LABEL maintainer="<[email protected]>"

diff --git a/build/docker/onex/Dockerfile.multistage b/build/docker/onex/Dockerfile.multistage
@@ -10,8 +10,8 @@
 # Build the onex binary
 
 # Run this with docker build --build-arg prod_image=<golang:x.y.z>
-# Default <prod_image> is debian:jessie
-ARG prod_image=debian:jessie
+# Default <prod_image> is debian:trixie
+ARG prod_image=debian:trixie
 
 # Ignore Hadolint rule "Always tag the version of an image explicitly."
 # It's an invalid finding since the image is explicitly set in the Makefile.

diff --git a/cmd/onex-apiserver/apiserver.go b/cmd/onex-apiserver/apiserver.go
@@ -11,7 +11,7 @@ package main
 import (
 	"os"
 
-	_ "go.uber.org/automaxprocs"
+	_ "go.uber.org/automaxprocs/maxprocs"
 	"k8s.io/component-base/cli"
 	_ "k8s.io/component-base/logs/json/register"          // for JSON log format registration
 	_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins

diff --git a/cmd/onex-cacheserver/main.go b/cmd/onex-cacheserver/main.go
@@ -9,7 +9,7 @@
 package main
 
 import (
-	_ "go.uber.org/automaxprocs"
+	_ "go.uber.org/automaxprocs/maxprocs"
 
 	"github.com/superproj/onex/cmd/onex-cacheserver/app"
 )

diff --git a/cmd/onex-controller-manager/controller-manager.go b/cmd/onex-controller-manager/controller-manager.go
@@ -11,7 +11,7 @@ package main
 import (
 	"os"
 
-	_ "go.uber.org/automaxprocs"
+	_ "go.uber.org/automaxprocs/maxprocs"
 	"k8s.io/component-base/cli"
 	_ "k8s.io/component-base/logs/json/register"          // for JSON log format registration
 	_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugin

diff --git a/cmd/onex-fakeserver/main.go b/cmd/onex-fakeserver/main.go
@@ -9,7 +9,7 @@
 package main
 
 import (
-	_ "go.uber.org/automaxprocs"
+	_ "go.uber.org/automaxprocs/maxprocs"
 
 	"github.com/superproj/onex/cmd/onex-fakeserver/app"
 )

diff --git a/cmd/onex-gateway/app/options/options.go b/cmd/onex-gateway/app/options/options.go
@@ -122,7 +122,7 @@ func (o *Options) Validate() error {
 	return utilerrors.NewAggregate(errs)
 }
 
-// ApplyTo fills up onex-nightwatch config with options.
+// ApplyTo fills up onex-gateway config with options.
 func (o *Options) ApplyTo(c *gateway.Config) error {
 	c.GRPCOptions = o.GRPCOptions
 	c.HTTPOptions = o.HTTPOptions
@@ -136,7 +136,7 @@ func (o *Options) ApplyTo(c *gateway.Config) error {
 	return nil
 }
 
-// Config return a onex-nightwatch config object.
+// Config return an onex-gateway config object.
 func (o *Options) Config() (*gateway.Config, error) {
 	kubeconfig, err := clientcmd.BuildConfigFromFlags("", o.Kubeconfig)
 	if err != nil {

diff --git a/cmd/onex-gateway/main.go b/cmd/onex-gateway/main.go
@@ -8,7 +8,7 @@
 package main
 
 import (
-	_ "go.uber.org/automaxprocs"
+	_ "go.uber.org/automaxprocs/maxprocs"
 
 	"github.com/superproj/onex/cmd/onex-gateway/app"
 )

diff --git a/cmd/onex-miner-controller/controller.go b/cmd/onex-miner-controller/controller.go
@@ -11,7 +11,7 @@ package main
 import (
 	"os"
 
-	_ "go.uber.org/automaxprocs"
+	_ "go.uber.org/automaxprocs/maxprocs"
 	"k8s.io/component-base/cli"
 	_ "k8s.io/component-base/logs/json/register"          // for JSON log format registration
 	_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugin

diff --git a/cmd/onex-minerset-controller/controller.go b/cmd/onex-minerset-controller/controller.go
@@ -10,7 +10,7 @@ package main
 import (
 	"os"
 
-	_ "go.uber.org/automaxprocs"
+	_ "go.uber.org/automaxprocs/maxprocs"
 	"k8s.io/component-base/cli"
 	_ "k8s.io/component-base/logs/json/register"          // for JSON log format registration
 	_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugin