Merge remote-tracking branch 'origin/3.4.0-dev' into 3.4.0-dev

README.md

@@ -74,14 +74,37 @@
 
 ## 安装
 
+### 本地试用
+
 [下载](https://github.com/b3log/solo/releases)最新的 Solo 包解压，进入解压目录执行：
 
 * Windows: `java -cp "WEB-INF/lib/*;WEB-INF/classes" org.b3log.solo.Starter`
 * Unix-like: `java -cp "WEB-INF/lib/*:WEB-INF/classes" org.b3log.solo.Starter`
 
-用 `Docker` 运行？
+如果你有 Java 开发环境，可参考[这里(https://hacpai.com/article/1493822943172)通过源码构建运行。
+
+**请注意**：我们不推荐通过发布包部署或者源码源码构建部署，因为这样的部署方式在将来有新版本发布时升级会比较麻烦。
+这两种方式请仅用于本地试用，线上生产环境我们**强烈建议**通过 Docker 进行部署。
+
+### Docker
+
+获取最新镜像：
+
+```shell
+docker pull b3log/solo
+```
+
+* 使用 MySQL
+  TBD
+  ```shell
+  docker run --name solo -p 8080:8080 --net=host -d b3log/solo
+  ```
+* 使用 H2 Databse
+
+  ```shell
+  docker run --name solo -p 8080:8080 -v ~/solo_h2:/opt/b3log/backup/ -d b3log/solo
+  ```
 
-`docker volume create solo_datas && docker run --privileged --name solo --restart=unless-stopped -p 8080:8080 -v solo_datas:/opt/b3log/backup/ -d b3log/solo`
 
 ## 文档
 

docker-compose.yml

@@ -8,7 +8,7 @@ services:
     ports:
       - 8080:8080
     environment:
-      SERVER_SCHMEA: https
+      SERVER_SCHEME: https
       SERVER_NAME: <your host>
       SERVER_PORT: 80
     volumes:

src/main/resources/docker/entrypoint.sh

@@ -17,7 +17,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-
 ## author: tomaer.Ma <i@tomaer.com>
 
 DATEBASE_TYPE=${DATEBASE_TYPE:-h2}
@@ -36,7 +35,7 @@ if [ ! -f "/opt/b3log/solo/WEB-INF/classes/local.properties" ]; then
     fi
 
     cat /opt/b3log/tmp/latke.properties | sed \
-     -e "s|{{SERVER_SCHMEA}}|${SERVER_SCHMEA:-http}|g" \
+     -e "s|{{SERVER_SCHEME}}|${SERVER_SCHEME:-http}|g" \
      -e "s|{{SERVER_NAME}}|${SERVER_NAME:-localhost}|g" \
      -e "s|{{SERVER_PORT}}|${SERVER_PORT:-8080}|g" \
     > /opt/b3log/solo/WEB-INF/classes/latke.properties

src/main/resources/docker/latke.properties

@@ -24,7 +24,7 @@
 
 #### Server ####
 # Browser visit protocol
-serverScheme={{SERVER_SCHMEA}}
+serverScheme={{SERVER_SCHEME}}
 # Browser visit domain name
 serverHost={{SERVER_NAME}}
 # Browser visit port, 80 as usual, THIS IS NOT SERVER LISTEN PORT!

src/main/resources/docker/local.properties.h2

@@ -22,8 +22,5 @@ jdbc.URL=jdbc:h2:/opt/b3log/backup/solo_h2/db
 jdbc.minConnCnt=5
 jdbc.maxConnCnt=10
 
-# Be care to change the transaction isolation 
-jdbc.transactionIsolation=REPEATABLE_READ
-
 # The specific table name prefix
 jdbc.tablePrefix=b3_solo

src/main/resources/docker/local.properties.mysql

@@ -22,8 +22,5 @@ jdbc.URL=jdbc:mysql://{{DATABASE_HOST}}:{{DATABASE_PORT}}/{{DATABASE_NAME}}?useU
 jdbc.minConnCnt=5
 jdbc.maxConnCnt=10
 
-# Be care to change the transaction isolation 
-jdbc.transactionIsolation=REPEATABLE_READ
-
 # The specific table name prefix
 jdbc.tablePrefix=b3_solo