Skip to content

Commit c7099d1

Browse files
committed
fix bugs for build
1 parent b77440d commit c7099d1

File tree

9 files changed

+31
-82
lines changed

9 files changed

+31
-82
lines changed

.idea/workspace.xml

+14-68
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONE: build clean
22
export AGENT_VERSION = 1.0.3
3-
export BLADE_VERSION = 1.7.2
3+
export BLADE_VERSION = 1.7.4
44

55
BLADE_SRC_ROOT=$(shell pwd)
66

@@ -55,10 +55,10 @@ build_image:
5555
rm -rf $(BUILD_IMAGE_MUSL_PATH)/agent
5656
cp $(BUILD_BINARY_PATH)/agent $(BUILD_IMAGE_MUSL_PATH)
5757
docker build --pull --build-arg BLADE_VERSION=${BLADE_VERSION} -f $(BUILD_IMAGE_MUSL_PATH)/Dockerfile \
58-
-t chaosbladeio/chaosblade-agent:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_MUSL_PATH)
58+
-t ghcr.io/chaosblade-io/chaosblade-agent:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_MUSL_PATH)
5959

6060
build_image_arm:
6161
rm -rf $(BUILD_IMAGE_ARM64_PATH)/agent
6262
cp $(BUILD_BINARY_PATH)/agent $(BUILD_IMAGE_ARM64_PATH)
6363
docker build --pull --build-arg BLADE_VERSION=${BLADE_VERSION} -f $(BUILD_IMAGE_ARM64_PATH)/Dockerfile \
64-
-t chaosbladeio/chaosblade-agent-arm64:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_ARM64_PATH)
64+
-t ghcr.io/chaosblade-io/chaosblade-agent-arm64:$(AGENT_VERSION) $(BLADE_SRC_ROOT)/$(BUILD_IMAGE_ARM64_PATH)

build/binary_arm/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ RUN wget http://www.musl-libc.org/releases/musl-1.1.21.tar.gz \
1616
&& rm -rf musl*
1717

1818
# install go
19-
RUN wget https://dl.google.com/go/go1.13.10.linux-arm64.tar.gz \
20-
&& tar -C /usr/local -xzf go1.13.10.linux-arm64.tar.gz \
21-
&& rm -rf go1.13.10.linux-arm64.tar.gz
19+
RUN wget https://dl.google.com/go/go1.20.linux-arm64.tar.gz \
20+
&& tar -C /usr/local -xzf go1.20.linux-arm64.tar.gz \
21+
&& rm -rf go1.20.linux-arm64.tar.gz
2222

2323
ENV CC /usr/local/musl/bin/musl-gcc
2424
ENV GOOS linux
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
appVersion: "1.0.3"
33
description: A SaaS-based service that aims to improve the high availability of your applications.
4-
name: chaosblade-box-agent
4+
name: chaosblade-box-agent-arm64
55
version: 1.0.3
66
home: https://www.alibabacloud.com/products/chaos

build/helm3/chaos-agent-arm/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ images:
1212
# chaos agent image named chaos-agent
1313
chaos:
1414
version: 1.0.3
15-
repository: chaosbladeio/chaosblade-agent-arm64
15+
repository: ghcr.io/chaosblade-io/chaosblade-agent-arm64
1616
# images.chaos.pullPolicy: must be Always|IfNotPresent|Never
1717
pullPolicy: Always
1818

build/helm3/chaos-agent/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
appVersion: "1.0.3"
33
description: A SaaS-based service that aims to improve the high availability of your applications.
4-
name: chaosblade-box-agent
4+
name: chaosblade-box-agent-amd64
55
version: 1.0.3
66
home: https://www.alibabacloud.com/products/chaos

build/helm3/chaos-agent/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ images:
1212
# chaos agent image named chaos-agent
1313
chaos:
1414
version: 1.0.3
15-
repository: chaosbladeio/chaosblade-agent
15+
repository: ghcr.io/chaosblade-io/chaosblade-agent
1616
# images.chaos.pullPolicy: must be Always|IfNotPresent|Never
1717
pullPolicy: Always
1818

build/image_arm/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM multiarch/alpine:arm64-edge
1+
FROM multiarch/alpine:arm64-v3.14
22
LABEL maintainer="Mingxia Cai"
33

4-
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
4+
#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
5+
RUN sed -i 's/https/http/' /etc/apk/repositories
56

67
RUN apk add --update bash iproute2 util-linux curl openssl gcc musl-dev libpcap-dev audit coreutils \
78
&& mkdir -p /lib/modules/$(uname -r) \

build/image_musl/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
FROM alpine:3.8
1+
FROM alpine:3.18
22
LABEL maintainer="Mingxia Cai"
33

4-
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
4+
#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
5+
6+
RUN sed -i 's/https/http/' /etc/apk/repositories
57

68
RUN apk add --update bash iproute2 util-linux curl openssl gcc musl-dev libpcap-dev audit coreutils \
79
&& mkdir -p /lib/modules/$(uname -r) \

0 commit comments

Comments
 (0)