Skip to content

Commit

Permalink
chore: update chaosblade modules version to 0.6.0
Browse files Browse the repository at this point in the history
Signed-off-by: xcaspar <[email protected]>
  • Loading branch information
xcaspar committed May 27, 2020
1 parent f8b9b9b commit 15834f1
Show file tree
Hide file tree
Showing 4 changed files with 827 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif

BLADE_BIN=blade
BLADE_EXPORT=chaosblade-$(BLADE_VERSION).tgz
BLADE_SRC_ROOT=`pwd`
BLADE_SRC_ROOT=$(pwd)

GO_ENV=CGO_ENABLED=1
GO_MODULE=GO111MODULE=on
Expand Down Expand Up @@ -66,7 +66,7 @@ ifeq ($(GOOS), linux)
endif

# build chaosblade package and image
build: pre_build build_cli build_os build_docker build_kubernetes build_java build_cplus
build: pre_build build_cli build_os build_docker build_kubernetes build_cplus
# tar package
tar zcvf $(BUILD_TARGET_PKG_FILE_PATH) -C $(BUILD_TARGET) $(BUILD_TARGET_DIR_NAME)

Expand Down
4 changes: 2 additions & 2 deletions build/image/musl/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.1
FROM golang:1.13.1
LABEL maintainer="Changjun Xiao"

# # The image is used to build chaosblade for musl
Expand All @@ -18,7 +18,7 @@ RUN wget http://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.6.3/binaries
&& mv apache-maven-3.6.3 /usr/local/apache-maven-3.6.3

RUN apt-get update \
&& apt-get install -y unzip openjdk-8-jdk
&& apt-get install -y unzip openjdk-11-jdk

ENV CC /usr/local/musl/bin/musl-gcc
ENV GOOS linux
Expand Down
26 changes: 14 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@ module github.com/chaosblade-io/chaosblade
go 1.13

require (
github.com/chaosblade-io/chaosblade-exec-docker v0.5.1-0.20200427181253-0f01189464d7
github.com/chaosblade-io/chaosblade-exec-os v0.5.1-0.20200427181027-059c92d02189
github.com/chaosblade-io/chaosblade-operator v0.5.1-0.20200428050021-e3c4ee289585
github.com/chaosblade-io/chaosblade-spec-go v0.5.1-0.20200427065047-9b9366028c04
github.com/chaosblade-io/chaosblade-exec-docker v0.6.0
github.com/chaosblade-io/chaosblade-exec-os v0.6.0
github.com/chaosblade-io/chaosblade-operator v0.6.0
github.com/chaosblade-io/chaosblade-spec-go v0.6.0
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/mattn/go-sqlite3 v1.10.1-0.20190217174029-ad30583d8387
github.com/prometheus/common v0.2.0
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/prometheus/common v0.9.1
github.com/shirou/gopsutil v2.19.9+incompatible
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.4-0.20190109003409-7547e83b2d85
github.com/spf13/pflag v1.0.4-0.20181223182923-24fa6976df40
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
k8s.io/apimachinery v0.17.0
k8s.io/client-go v11.0.0+incompatible
sigs.k8s.io/controller-runtime v0.1.12
github.com/sirupsen/logrus v1.5.0
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d
k8s.io/apimachinery v0.17.4
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/controller-runtime v0.5.3
)

// Pinned to kubernetes-1.13.11
Expand Down
Loading

0 comments on commit 15834f1

Please sign in to comment.