Skip to content

Commit

Permalink
0.12.1 doc
Browse files Browse the repository at this point in the history
  • Loading branch information
brookshi committed Jun 1, 2018
1 parent 5d1d0cf commit 8dbbf61
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 11 deletions.
13 changes: 13 additions & 0 deletions cn/change_log.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
#### 0.12.1 2018-06-01

**Features:**

* \#149 改进对swagger的导入支持

**Bugs:**

* \#172 如果语言改错,默认使用en
* \#192 使用request库时会提示cannot find module 'hawk'
* \#189 在脚本里使用console.log时,如果输出的是对象会导致异常


#### 0.12 2018-05-23

**Features:**
Expand Down
2 changes: 1 addition & 1 deletion cn/installation/StepByStep.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
> 创建DB的脚本: CREATE DATABASE IF NOT EXISTS \`hitchhiker-prod\` default charset utf8 COLLATE utf8_general_ci;
> 修改变量需要把`max_allowed_packet=200M`加到 my.ini 文件[mysqld] Section下,具体参考:[change max_allowed_packet](https://stackoverflow.com/questions/8062496/how-to-change-max-allowed-packet-size)
1. 下载安装包 [https://github.com/brookshi/Hitchhiker/releases/download/v0.12/Hitchhiker.zip](https://github.com/brookshi/Hitchhiker/releases/download/v0.12/Hitchhiker.zip);
1. 下载安装包 [https://github.com/brookshi/Hitchhiker/releases/download/v0.12.1/Hitchhiker.zip](https://github.com/brookshi/Hitchhiker/releases/download/v0.12.1/Hitchhiker.zip);
下载速度慢的可以去阿里云下载 http://hitchhiker.oss-cn-hongkong.aliyuncs.com/Hitchhiker.zip

2. 解压并在build目录下(即setup.js的目录)执行命令`node setup.js`(windows), `sudo node setup.js`(linux);
Expand Down
10 changes: 5 additions & 5 deletions cn/installation/docker.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
docker使用的是docker-compose来安装,会自动下载两个image:hitchhiker和mysql,基本上按命令执行即可,如果需要配置,可以参考:[配置文件](configuration.md), 环境变量可以写到docker-compose.yml里

国内用户请使用阿里云的镜像 hitchhiker-cn:registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12
国内用户请使用阿里云的镜像 hitchhiker-cn:registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12.1

#### 参考下面命令,一步一步部署 (基于ubuntu,其他系统类似):
``` bash
Expand All @@ -21,7 +21,7 @@ curl -O https://raw.githubusercontent.com/brookshi/Hitchhiker/release/deploy/doc

# 编辑 docker-compose.yml, 把localhost换成你机器的局域网ip,如果是只有本机一个人用那就localhost也可以
sudo vim docker-compose.yml
# 修改完成后,保存退出 (国内用户改image地址:registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12, 以及写入环境变量配置hitchhiker以及mysql)
# 修改完成后,保存退出 (国内用户改image地址:registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12.1, 以及写入环境变量配置hitchhiker以及mysql)
...

# 执行docker-compose up安装镜像
Expand All @@ -36,7 +36,7 @@ curl http://ip:8080/
version: '2'
services:
hitchhiker:
image: registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12
image: registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12.1
container_name: hitchhiker
environment:
- HITCHHIKER_DB_HOST=hitchhiker-mysql
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
version: '2'
services:
hitchhiker:
image: registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12
image: registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12.1
container_name: hitchhiker
environment:
- HITCHHIKER_DB_HOST=hitchhiker-mysql
Expand Down Expand Up @@ -96,7 +96,7 @@ services:
version: '2'
services:
hitchhiker:
image: registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12
image: registry.cn-hangzhou.aliyuncs.com/brook/hitchhiker-cn:v0.12.1
container_name: hitchhiker
environment:
- HITCHHIKER_DB_HOST=192.168.0.10
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/hitchhiker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
hitchhiker:
image: brookshi/hitchhiker:v0.12
image: brookshi/hitchhiker:v0.12.1
container_name: hitchhiker
environment:
- HITCHHIKER_DB_HOST=hitchhiker-mysql
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/hitchhiker_and_mysql/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
hitchhiker:
image: brookshi/hitchhiker:v0.12
image: brookshi/hitchhiker:v0.12.1
container_name: hitchhiker
environment:
- HITCHHIKER_DB_HOST=hitchhiker-mysql
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/push_docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export HITCHHIKER_VERSION="v0.12"
export HITCHHIKER_VERSION="v0.12.1"
sudo docker pull registry.us-east-1.aliyuncs.com/brook/hitchhiker:$HITCHHIKER_VERSION
sudo docker login --username=brookshi --password=$DOCKER_ID_PWD
sudo docker tag registry.us-east-1.aliyuncs.com/brook/hitchhiker:$HITCHHIKER_VERSION brookshi/hitchhiker:$HITCHHIKER_VERSION
Expand Down
13 changes: 13 additions & 0 deletions en/change_log.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
#### 0.12.1 2018-06-01

**Features:**

* \#149 Improve swagger importer

**Bugs:**

* \#172 Use default lang 'en' if set nonsupport lang in setting
* \#192 Error while using request lib: cannot find module 'hawk'
* \#189 Exception while using console.log to display object


#### 0.12 2018-05-23

**Features:**
Expand Down
2 changes: 1 addition & 1 deletion en/installation/StepByStep.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Dependence: nodejs 7.60+, recommend use LTS (8.9) and `mysql 5.7+` with json col
> create DB: CREATE DATABASE IF NOT EXISTS \`hitchhiker-prod\` default charset utf8 COLLATE utf8_general_ci;
> change variable: add `max_allowed_packet=200M` under [mysqld] section in /my.conf file, refer to:[change max_allowed_packet](https://stackoverflow.com/questions/8062496/how-to-change-max-allowed-packet-size)
1. Download app package from [https://github.com/brookshi/Hitchhiker/releases/download/v0.12/Hitchhiker.zip](https://github.com/brookshi/Hitchhiker/releases/download/v0.12/Hitchhiker.zip);
1. Download app package from [https://github.com/brookshi/Hitchhiker/releases/download/v0.12.1/Hitchhiker.zip](https://github.com/brookshi/Hitchhiker/releases/download/v0.12.1/Hitchhiker.zip);

2. Unzip and run command `node setup.js`(windows), `sudo node setup.js`(linux) in `build` folder;

Expand Down
2 changes: 1 addition & 1 deletion en/installation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ If you want to use another port, should replace all 8080.
version: '2'
services:
hitchhiker:
image: brookshi/hitchhiker:v0.12
image: brookshi/hitchhiker:v0.12.1
container_name: hitchhiker
environment:
- HITCHHIKER_DB_HOST=hitchhiker-mysql
Expand Down

0 comments on commit 8dbbf61

Please sign in to comment.