diff --git a/Makefile b/Makefile index da5bc663..1ac06715 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: build clean -export BLADE_VERSION=1.7.0 +export BLADE_VERSION=1.7.1 ALLOWGITVERSION=1.8.5 GITVERSION:=$(shell git --version | grep ^git | sed 's/^.* //g') @@ -48,7 +48,6 @@ BUILD_TARGET_CACHE=$(BUILD_TARGET)/cache BLADE_EXEC_OS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-os.git BLADE_EXEC_OS_BRANCH=master - # chaosblade-exec-middleware BLADE_EXEC_MIDDLEWARE_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-middleware.git BLADE_EXEC_MIDDLEWARE_BRANCH=main @@ -57,7 +56,6 @@ BLADE_EXEC_MIDDLEWARE_BRANCH=main BLADE_EXEC_CLOUD_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cloud.git BLADE_EXEC_CLOUD_BRANCH=main - # chaosblade-exec-cri BLADE_EXEC_CRI_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cri.git BLADE_EXEC_CRI_BRANCH=main @@ -222,7 +220,7 @@ build_image: ## Build chaosblade-tool image tar zxvf $(BUILD_TARGET_PKG_NAME) -C $(BUILD_IMAGE_PATH) docker build -f $(BUILD_IMAGE_PATH)/Dockerfile \ --build-arg BLADE_VERSION=$(BLADE_VERSION) \ - -t chaosblade-tool:$(BLADE_VERSION) \ + -t chaosbladeio/chaosblade-tool:$(BLADE_VERSION) \ $(BUILD_IMAGE_PATH) rm -rf $(BUILD_IMAGE_PATH)/$(BUILD_TARGET_DIR_NAME) @@ -232,7 +230,7 @@ build_image_arm: ## Build chaosblade-tool-arm image tar zxvf $(BUILD_TARGET_PKG_NAME) -C $(BUILD_ARM_IMAGE_PATH) docker build -f $(BUILD_ARM_IMAGE_PATH)/Dockerfile \ --build-arg BLADE_VERSION=$(BLADE_VERSION) \ - -t chaosblade-tool-arm64:$(BLADE_VERSION) \ + -t chaosbladeio/chaosblade-tool-arm64:$(BLADE_VERSION) \ $(BUILD_ARM_IMAGE_PATH) rm -rf $(BUILD_ARM_IMAGE_PATH)/$(BUILD_TARGET_DIR_NAME) @@ -277,7 +275,7 @@ build_linux_with_arg: -v $(shell echo -n ${GOPATH}):/go \ -w /go/src/github.com/chaosblade-io/chaosblade \ -v ~/.m2/repository:/root/.m2/repository \ - -v $(shell pwd):/go/src/github.com/chaosblade-io/chaosblade \ + -v $(shell pwd):/go/src/github.com/chaosblade-io/chaosblade \ chaosbladeio/chaosblade-build-musl:latest build_with $$ARGS ## Select scenario build linux arm version by docker image diff --git a/build/spec/spec.go b/build/spec/spec.go index 5df355d7..d15688a0 100644 --- a/build/spec/spec.go +++ b/build/spec/spec.go @@ -29,7 +29,7 @@ import ( "github.com/chaosblade-io/chaosblade/cli/cmd" ) -var version = "1.7.0" +var version = "1.7.1" func main() { diff --git a/exec/middleware/executor.go b/exec/middleware/executor.go index de52533f..883a7915 100644 --- a/exec/middleware/executor.go +++ b/exec/middleware/executor.go @@ -19,7 +19,7 @@ package middleware import ( "context" "fmt" - "github.com/chaosblade-io/chaosblade-exec-os/exec" + "github.com/chaosblade-io/chaosblade-exec-middleware/exec" "github.com/chaosblade-io/chaosblade-spec-go/log" "github.com/chaosblade-io/chaosblade-spec-go/spec" "github.com/chaosblade-io/chaosblade-spec-go/util" diff --git a/go.mod b/go.mod index 74f137c4..db7d6960 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,12 @@ module github.com/chaosblade-io/chaosblade go 1.13 require ( - github.com/chaosblade-io/chaosblade-exec-cloud v0.0.0-20221103094528-5744058cb750 - github.com/chaosblade-io/chaosblade-exec-cri v1.7.0 - github.com/chaosblade-io/chaosblade-exec-os v1.7.0 - github.com/chaosblade-io/chaosblade-operator v1.7.0 - github.com/chaosblade-io/chaosblade-spec-go v1.7.1-0.20221103094628-4b243b319ff6 + github.com/chaosblade-io/chaosblade-exec-cloud v1.7.1 + github.com/chaosblade-io/chaosblade-exec-cri v1.7.1 + github.com/chaosblade-io/chaosblade-exec-middleware v1.7.1 + github.com/chaosblade-io/chaosblade-exec-os v1.7.1 + github.com/chaosblade-io/chaosblade-operator v1.7.1 + github.com/chaosblade-io/chaosblade-spec-go v1.7.1 github.com/mattn/go-sqlite3 v1.10.1-0.20190217174029-ad30583d8387 github.com/olekukonko/tablewriter v0.0.5-0.20201029120751-42e21c7531a3 github.com/shirou/gopsutil v3.21.8-0.20210816101416-f86a04298073+incompatible diff --git a/go.sum b/go.sum index 2bc7f25a..6267dce1 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,7 @@ github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6q github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220816024939-bc8df83d7b9d/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= @@ -183,18 +184,19 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -github.com/chaosblade-io/chaosblade-exec-cloud v0.0.0-20221103094528-5744058cb750 h1:lyVFO5McOsOGC9ixkeNtJSGh65X2hEV4J9fXoKMx8JM= -github.com/chaosblade-io/chaosblade-exec-cloud v0.0.0-20221103094528-5744058cb750/go.mod h1:ndiD3ZnQXjo480tX8sgqAdFQTzLRcuo4WFr4UjTt4us= -github.com/chaosblade-io/chaosblade-exec-cri v1.7.0 h1:TOqA0UZS317dISb3nTwGR1Dlyr0HqsrwT5buamjZ20I= -github.com/chaosblade-io/chaosblade-exec-cri v1.7.0/go.mod h1:ka3BMJWLJd18DXt8no68WcYD8oVuhN5GeCyDf8uFK3s= -github.com/chaosblade-io/chaosblade-exec-os v1.7.0 h1:Y0V4a2LqGwVxqvVORGkXS6Y9xx1CuTWhihneGmrdAAY= -github.com/chaosblade-io/chaosblade-exec-os v1.7.0/go.mod h1:e8TuopYAESkl5ZgSjfnDL03KwO09tmA1H6Y8oPNZElw= -github.com/chaosblade-io/chaosblade-operator v1.7.0 h1:MBSsDTvisePhhtKzP9F7eTy4O2qvS4PghCQmPAggaT0= -github.com/chaosblade-io/chaosblade-operator v1.7.0/go.mod h1:XLB6bqrHuuhmY8kRyF0b55+jwgCgJwI3w+oIMfY5mHc= -github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300/go.mod h1:977aR5J4BBfLtFkYZkbHv1i7NJYN1X0x85xO3b8YLpc= +github.com/chaosblade-io/chaosblade-exec-cloud v1.7.1 h1:eJqqLbG8+Wdt6+padrTuTFNRgV9dOkQ41+fWRQwEoH8= +github.com/chaosblade-io/chaosblade-exec-cloud v1.7.1/go.mod h1:C+Z146yzK7fb8bLjy60Un0UgoWbL+FfpE8JGehQlngw= +github.com/chaosblade-io/chaosblade-exec-cri v1.7.1 h1:+8Q6XTvFiXpI61oFfOHdVvMp+27/bKFeIkxOz5Ef4hA= +github.com/chaosblade-io/chaosblade-exec-cri v1.7.1/go.mod h1:Epb7aK95LkXsyT4qS7nUNcZb+1T9n3uuDXjJ1raO+rk= +github.com/chaosblade-io/chaosblade-exec-middleware v1.7.1 h1:zkxW26EbQsPLPLX8dRANtsHUnPjA5h3cFkD0rhR3wbc= +github.com/chaosblade-io/chaosblade-exec-middleware v1.7.1/go.mod h1:47PLfUY0NOGIHoRgP+Ry4KxbMjnq00hTuGIK+D8Mc8U= +github.com/chaosblade-io/chaosblade-exec-os v1.7.1 h1:1v5FszYQOFm4tdxTRJuF8DM54Rd1bs90zWeyjE6Wke8= +github.com/chaosblade-io/chaosblade-exec-os v1.7.1/go.mod h1:e8TuopYAESkl5ZgSjfnDL03KwO09tmA1H6Y8oPNZElw= +github.com/chaosblade-io/chaosblade-operator v1.7.1 h1:WbQNqckUXeqGArZhLxf6DYW1ks2i0LuAGlSNoqFWkoI= +github.com/chaosblade-io/chaosblade-operator v1.7.1/go.mod h1:yrDIz2KApZqWfrJ47fJduBP9Mn/r9lqu6sRky7mb/dk= github.com/chaosblade-io/chaosblade-spec-go v1.7.0/go.mod h1:GMDRCEt9jw2+PdX+S2eKBg4ES6PENRc7xsLohWJWM6s= -github.com/chaosblade-io/chaosblade-spec-go v1.7.1-0.20221103094628-4b243b319ff6 h1:V2KMCEQSrcb2l/rgjWfgoccjiqUE6/teEI+9/szcb5c= -github.com/chaosblade-io/chaosblade-spec-go v1.7.1-0.20221103094628-4b243b319ff6/go.mod h1:GMDRCEt9jw2+PdX+S2eKBg4ES6PENRc7xsLohWJWM6s= +github.com/chaosblade-io/chaosblade-spec-go v1.7.1 h1:6umonDJj6UW0WjKy9DnWQMe4kdFHdgAIzlLSlSucpFA= +github.com/chaosblade-io/chaosblade-spec-go v1.7.1/go.mod h1:GMDRCEt9jw2+PdX+S2eKBg4ES6PENRc7xsLohWJWM6s= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=