diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b23715369..99256c50e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: Publish a Docker image +name: Release on: push: @@ -221,7 +221,7 @@ jobs: done <<< "${{ steps.meta.outputs.tags }}" cli: - name: Build the CLI and release + name: Build the CLI and publish runs-on: ubuntu-latest needs: [docker-manifest, gcp-registry] steps: diff --git a/cli/config/configStruct.go b/cli/config/configStruct.go index bbb77ea75..e629ca20b 100644 --- a/cli/config/configStruct.go +++ b/cli/config/configStruct.go @@ -2,15 +2,16 @@ package config import ( "fmt" + "os" + "path" + "path/filepath" + "github.com/op/go-logging" "github.com/up9inc/mizu/cli/config/configStructs" "github.com/up9inc/mizu/cli/mizu" "github.com/up9inc/mizu/shared" v1 "k8s.io/api/core/v1" "k8s.io/client-go/util/homedir" - "os" - "path" - "path/filepath" ) const ( @@ -52,7 +53,7 @@ func (config *ConfigStruct) validate() error { func (config *ConfigStruct) SetDefaults() { config.BasenineImage = fmt.Sprintf("%s:%s", shared.BasenineImageRepo, shared.BasenineImageTag) config.KratosImage = shared.KratosImageDefault - config.AgentImage = fmt.Sprintf("gcr.io/up9-docker-hub/mizu/%s:%s", mizu.Branch, mizu.SemVer) + config.AgentImage = fmt.Sprintf("%s:%s", shared.MizuAgentImageRepo, mizu.SemVer) config.ConfigFilePath = path.Join(mizu.GetMizuFolderPath(), "config.yaml") } diff --git a/shared/consts.go b/shared/consts.go index 57e2f827a..855d18549 100644 --- a/shared/consts.go +++ b/shared/consts.go @@ -14,6 +14,7 @@ const ( GoGCEnvVar = "GOGC" DefaultApiServerPort = 8899 LogLevelEnvVar = "LOG_LEVEL" + MizuAgentImageRepo = "docker.io/up9inc/mizu" BasenineHost = "127.0.0.1" BaseninePort = "9099" BasenineImageRepo = "docker.io/up9inc/basenine"