Skip to content

Commit

Permalink
update version\README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
MandssS committed Apr 21, 2022
1 parent 59e828c commit a64384c
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 22 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ WORKDIR /app
# && mv linux-amd64/helm /usr/local/bin/helm \
# && rm -rf helm-v3.5.3-linux-amd64.tar.gz

COPY ./chaosblade-box-starter/target/chaosblade-box.jar .

ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "chaosblade-box.jar"]
COPY ./chaosblade-box-starter/target/chaosblade-box-1.0.0.jar .

ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "chaosblade-box-1.0.0.jar"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ app:
-p 8080:8080 \
-p 8000:8000 \
openjdk:8 \
java -Duser.timezone=Asia/Shanghai -jar /root/chaosblade-box-web-${CHAOS_PLATFORM_VERSION}.jar
java -Duser.timezone=Asia/Shanghai -jar /root/chaosblade-box-${CHAOS_PLATFORM_VERSION}.jar

build_image:
docker build --rm -t chaosblade-box:${CHAOS_PLATFORM_VERSION} .
Expand Down
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Notes: You must replace the follow parameters: DATASOURCE_HOST, DATASOURCE_USERN
Then run the application, run method is as follows:

```bash
nohup java -Duser.timezone=Asia/Shanghai -jar chaosblade-box.jar --spring.datasource.url="jdbc:mysql://DATASOURCE_HOST:3306/chaosblade?characterEncoding=utf8&useSSL=false" --spring.datasource.username=DATASOURCE_USERNAME --spring.datasource.password=DATASOURCE_PASSWORD --chaos.server.domain=BOX-HOST> chaosblade-box.log 2>&1 &
nohup java -Duser.timezone=Asia/Shanghai -jar chaosblade-box-1.0.0.jar --spring.datasource.url="jdbc:mysql://DATASOURCE_HOST:3306/chaosblade?characterEncoding=utf8&useSSL=false" --spring.datasource.username=DATASOURCE_USERNAME --spring.datasource.password=DATASOURCE_PASSWORD --chaos.server.domain=BOX-HOST> chaosblade-box.log 2>&1 &
```

You can use a browser to access the http://127.0.0.1:7001 website to use the platform.
Expand All @@ -98,6 +98,17 @@ chaosblade-box LoadBalancer 192.168.255.01 10.10.10.03 7001
chaosblade-box-mysql ClusterIP 192.168.168.02 <none> 3306/TCP 12h
```

## Parameter Parsing
* spring.datasource.url: Mysql url.If helm starts, no assignment is required.
* spring.datasource.username: Mysql username.If helm starts, no assignment is required.
* spring.datasource.password: Mysql password.Required.
* chaos.function.sync.type: Init chaos data.If the first start,can use `ALL`.Available values `ALL`,`ChaosBlade`,`UserApp`,`None`,`LITMUS_CHAOS`. Default is `ALL`.
* chaos.agent.version: chaosblade-box-agent version.Default is `1.0.0`.
* chaos.agent.repository: chaosblade-box-agent image repository.Default is `chaosbladeio/chaosblade-agent`.
* chaos.agent.url: chaosblade-box-agent binary package url.Default is `https://chaosblade.oss-cn-hangzhou.aliyuncs.com/platform/release/1.0.0/chaosagent.tar.gz`.
* chaos.agent.helm: chaosblade-box-agent helm package url.Default is `https://chaosblade.oss-cn-hangzhou.aliyuncs.com/platform/release/1.0.0/chaosblade-box-agent-1.0.0.tgz`.


## Bugs and Feedback
For bug report, questions and discussions please submit [GitHub Issues](https://github.com/chaosblade-io/chaosblade-box/issues).

Expand Down
2 changes: 1 addition & 1 deletion chaosblade-box-agent-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>chaosblade-box</artifactId>
<groupId>io.chaosblade</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion chaosblade-box-cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>chaosblade-box</artifactId>
<groupId>io.chaosblade</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion chaosblade-box-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>chaosblade-box</artifactId>
<groupId>io.chaosblade</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion chaosblade-box-dao/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>chaosblade-box</artifactId>
<groupId>io.chaosblade</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 3 additions & 3 deletions chaosblade-box-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>chaosblade-box</artifactId>
<groupId>io.chaosblade</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>io.chaosblade</groupId>
<artifactId>chaosblade-box-cache</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>

Expand All @@ -99,7 +99,7 @@
<dependency>
<groupId>io.chaosblade</groupId>
<artifactId>chaosblade-box-toolsmgr</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions chaosblade-box-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>chaosblade-box</artifactId>
<groupId>io.chaosblade</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -57,7 +57,7 @@
</dependencies>

<build>
<finalName>chaosblade-box</finalName>
<finalName>chaosblade-box-${version}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ spring.thymeleaf.prefix=classpath:/build
spring.thymeleaf.mode=HTML5

chaos.agent.version=1.0.0
chaos.agent.repository="registry.cn-hangzhou.aliyuncs.com/chaosblade/chaos-agent"
chaos.agent.url=https://ahas-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com/agent/pre/test/community/chaos.tar.gz
chaos.agent.helm=https://ahas-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com/agent/pre/test/community/chaos-1.0.0.tgz
chaos.agent.repository=chaosbladeio/chaosblade-agent
chaos.agent.url=https://chaosblade.oss-cn-hangzhou.aliyuncs.com/platform/release/1.0.0/chaosagent.tar.gz
chaos.agent.helm=https://chaosblade.oss-cn-hangzhou.aliyuncs.com/platform/release/1.0.0/chaosblade-box-agent-1.0.0.tgz

#agent.blade.version=1.5.0
#agent.operator.version=1.5.0
Expand Down
2 changes: 1 addition & 1 deletion chaosblade-box-toolsmgr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>chaosblade-box</artifactId>
<groupId>io.chaosblade</groupId>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
8 changes: 4 additions & 4 deletions deploy/chaosblade-box/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Default values for chaosblade-box.
box:
repository: registry.cn-hangzhou.aliyuncs.com/chaosblade/chaosblade-box
repository: chaosbladeio/chaosblade-box
version: 1.0.0
pullPolicy: IfNotPresent

Expand All @@ -12,9 +12,9 @@ spring:
chaos:
agent:
version: 1.0.0
repository: registry.cn-hangzhou.aliyuncs.com/chaosblade/chaos-agent
url: https://ahas-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com/agent/pre/test/community/chaos.tar.gz
helm: https://ahas-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com/agent/pre/test/community/chaos-1.0.0.tgz
repository: chaosbladeio/chaosblade-agent
url: https://chaosblade.oss-cn-hangzhou.aliyuncs.com/platform/release/1.0.0/chaosagent.tar.gz
helm: https://chaosblade.oss-cn-hangzhou.aliyuncs.com/platform/release/1.0.0/chaosblade-box-agent-1.0.0.tgz
function:
sync:
type: ALL
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>io.chaosblade</groupId>
<artifactId>chaosblade-box</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<version>1.0.0</version>
<modules>
<module>chaosblade-box-agent-sdk</module>
<module>chaosblade-box-cache</module>
Expand Down

0 comments on commit a64384c

Please sign in to comment.