diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ef680ba..e9ac0d3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,73 +5,16 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -122,6 +65,7 @@
"RunOnceActivity.go.format.on.save.advertiser.fired": "true",
"RunOnceActivity.go.formatter.settings.were.checked": "true",
"RunOnceActivity.go.migrated.go.modules.settings": "true",
+ "RunOnceActivity.go.modules.automatic.dependencies.download": "true",
"RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
"RunOnceActivity.go.watchers.conflict.with.on.save.actions.check.performed": "true",
"WebServerToolWindowFactoryState": "false",
@@ -130,10 +74,19 @@
"go.import.settings.migrated": "true",
"go.sdk.automatically.set": "true",
"last_opened_file_path": "/Users/caimingxia/go/github/chaosblade-box-agent",
+ "node.js.detected.package.eslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
"settings.editor.selected.configurable": "go.dep"
}
}]]>
+
+
+
+
+
+
+
@@ -141,13 +94,6 @@
-
-
-
-
-
-
-
diff --git a/Makefile b/Makefile
index f1ad636..615ad9d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
.PHONE: build clean
export AGENT_VERSION = 1.0.3
-export BLADE_VERSION = 1.7.2
+export BLADE_VERSION = 1.7.4
BLADE_SRC_ROOT=$(shell pwd)
@@ -55,10 +55,10 @@ build_image:
rm -rf $(BUILD_IMAGE_MUSL_PATH)/agent
cp $(BUILD_BINARY_PATH)/agent $(BUILD_IMAGE_MUSL_PATH)
docker build --pull --build-arg BLADE_VERSION=${BLADE_VERSION} -f $(BUILD_IMAGE_MUSL_PATH)/Dockerfile \
- -t chaosbladeio/chaosblade-agent:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_MUSL_PATH)
+ -t ghcr.io/chaosblade-io/chaosblade-agent:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_MUSL_PATH)
build_image_arm:
rm -rf $(BUILD_IMAGE_ARM64_PATH)/agent
cp $(BUILD_BINARY_PATH)/agent $(BUILD_IMAGE_ARM64_PATH)
docker build --pull --build-arg BLADE_VERSION=${BLADE_VERSION} -f $(BUILD_IMAGE_ARM64_PATH)/Dockerfile \
- -t chaosbladeio/chaosblade-agent-arm64:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_ARM64_PATH)
+ -t ghcr.io/chaosblade-io/chaosblade-agent-arm64:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_ARM64_PATH)
diff --git a/build/binary_arm/Dockerfile b/build/binary_arm/Dockerfile
index 21a65e0..cdc9ff1 100644
--- a/build/binary_arm/Dockerfile
+++ b/build/binary_arm/Dockerfile
@@ -16,9 +16,9 @@ RUN wget http://www.musl-libc.org/releases/musl-1.1.21.tar.gz \
&& rm -rf musl*
# install go
-RUN wget https://dl.google.com/go/go1.13.10.linux-arm64.tar.gz \
- && tar -C /usr/local -xzf go1.13.10.linux-arm64.tar.gz \
- && rm -rf go1.13.10.linux-arm64.tar.gz
+RUN wget https://dl.google.com/go/go1.20.linux-arm64.tar.gz \
+ && tar -C /usr/local -xzf go1.20.linux-arm64.tar.gz \
+ && rm -rf go1.20.linux-arm64.tar.gz
ENV CC /usr/local/musl/bin/musl-gcc
ENV GOOS linux
diff --git a/build/helm3/chaos-agent-arm/Chart.yaml b/build/helm3/chaos-agent-arm/Chart.yaml
index b2e6470..4e094ff 100644
--- a/build/helm3/chaos-agent-arm/Chart.yaml
+++ b/build/helm3/chaos-agent-arm/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
appVersion: "1.0.3"
description: A SaaS-based service that aims to improve the high availability of your applications.
-name: chaosblade-box-agent
+name: chaosblade-box-agent-arm64
version: 1.0.3
home: https://www.alibabacloud.com/products/chaos
diff --git a/build/helm3/chaos-agent-arm/values.yaml b/build/helm3/chaos-agent-arm/values.yaml
index f383534..1b2e2aa 100644
--- a/build/helm3/chaos-agent-arm/values.yaml
+++ b/build/helm3/chaos-agent-arm/values.yaml
@@ -12,7 +12,7 @@ images:
# chaos agent image named chaos-agent
chaos:
version: 1.0.3
- repository: chaosbladeio/chaosblade-agent-arm64
+ repository: ghcr.io/chaosblade-io/chaosblade-agent-arm64
# images.chaos.pullPolicy: must be Always|IfNotPresent|Never
pullPolicy: Always
diff --git a/build/helm3/chaos-agent/Chart.yaml b/build/helm3/chaos-agent/Chart.yaml
index b2e6470..992a90d 100644
--- a/build/helm3/chaos-agent/Chart.yaml
+++ b/build/helm3/chaos-agent/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
appVersion: "1.0.3"
description: A SaaS-based service that aims to improve the high availability of your applications.
-name: chaosblade-box-agent
+name: chaosblade-box-agent-amd64
version: 1.0.3
home: https://www.alibabacloud.com/products/chaos
diff --git a/build/helm3/chaos-agent/values.yaml b/build/helm3/chaos-agent/values.yaml
index 4dde677..8e3c030 100644
--- a/build/helm3/chaos-agent/values.yaml
+++ b/build/helm3/chaos-agent/values.yaml
@@ -12,7 +12,7 @@ images:
# chaos agent image named chaos-agent
chaos:
version: 1.0.3
- repository: chaosbladeio/chaosblade-agent
+ repository: ghcr.io/chaosblade-io/chaosblade-agent
# images.chaos.pullPolicy: must be Always|IfNotPresent|Never
pullPolicy: Always
diff --git a/build/image_arm/Dockerfile b/build/image_arm/Dockerfile
index 1025fa1..801fdcd 100644
--- a/build/image_arm/Dockerfile
+++ b/build/image_arm/Dockerfile
@@ -1,7 +1,8 @@
-FROM multiarch/alpine:arm64-edge
+FROM multiarch/alpine:arm64-v3.14
LABEL maintainer="Mingxia Cai"
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+RUN sed -i 's/https/http/' /etc/apk/repositories
RUN apk add --update bash iproute2 util-linux curl openssl gcc musl-dev libpcap-dev audit coreutils \
&& mkdir -p /lib/modules/$(uname -r) \
diff --git a/build/image_musl/Dockerfile b/build/image_musl/Dockerfile
index c8c5e53..d66ea2e 100644
--- a/build/image_musl/Dockerfile
+++ b/build/image_musl/Dockerfile
@@ -1,7 +1,9 @@
-FROM alpine:3.8
+FROM alpine:3.18
LABEL maintainer="Mingxia Cai"
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+
+RUN sed -i 's/https/http/' /etc/apk/repositories
RUN apk add --update bash iproute2 util-linux curl openssl gcc musl-dev libpcap-dev audit coreutils \
&& mkdir -p /lib/modules/$(uname -r) \