Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG-FIX] fix bugs for build #12

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[BUG-FIX] fix bugs for build #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 14 additions & 68 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions build/binary_arm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/helm3/chaos-agent-arm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/helm3/chaos-agent-arm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/helm3/chaos-agent/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/helm3/chaos-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions build/image_arm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) \
Expand Down
6 changes: 4 additions & 2 deletions build/image_musl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) \
Expand Down