Skip to content

Commit 98e2d3a

Browse files
committed
upgrade to 8.6.1
1 parent 6586c8d commit 98e2d3a

File tree

3 files changed

+9
-31
lines changed

3 files changed

+9
-31
lines changed

README.md

+4-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
default port: 8090
55

6-
+ Latest Version: v8(8.5.2)
6+
+ Latest Version: v8(8.6.1)
77
+ Latest Chinese Version: [v7](https://github.com/haxqer/confluence/tree/latest-zh) (Thanks to: [sunny1025g](https://github.com/sunny1025g) for the `zh` image. [#issues/16](https://github.com/haxqer/confluence/issues/16) )
88

99
## Requirement
@@ -41,7 +41,7 @@ default port: 8090
4141
- start confluence
4242

4343
```
44-
docker volume create confluence_home_data && docker network create confluence-network && docker run -p 8090:8090 -v confluence_home_data:/var/confluence --network confluence-network --name confluence-srv -e TZ='Asia/Shanghai' haxqer/confluence:8.5.2
44+
docker volume create confluence_home_data && docker network create confluence-network && docker run -p 8090:8090 -v confluence_home_data:/var/confluence --network confluence-network --name confluence-srv -e TZ='Asia/Shanghai' haxqer/confluence:8.6.1
4545
```
4646

4747
- config your own db:
@@ -51,6 +51,7 @@ default port: 8090
5151

5252
```
5353
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
54+
-d \
5455
-p conf \
5556
-m Hello@world.com \
5657
-n Hello@world.com \
@@ -67,6 +68,7 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
6768

6869
```
6970
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
71+
-d \
7072
-p eu.softwareplant.biggantt \
7173
-m Hello@world.com \
7274
-n Hello@world.com \
@@ -76,19 +78,6 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
7678

7779
4. Paste your license
7880

79-
## `Datacenter` license
80-
81-
Generate `datacenter` license by adding `-d` parameter.
82-
83-
```
84-
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
85-
-d \
86-
-p conf \
87-
-m Hello@world.com \
88-
-n Hello@world.com \
89-
-o your-org \
90-
-s you-server-id-xxxx
91-
```
9281

9382
## How to upgrade
9483

README_zh.md

+4-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
默认端口: 8090
66

7-
+ 最新版本: v8(8.5.2)
7+
+ 最新版本: v8(8.6.1)
88
+ 最新的修复中文乱码问题的版本: [v7](https://github.com/haxqer/confluence/tree/latest-zh) (感谢: [sunny1025g](https://github.com/sunny1025g) for the `zh` image. [#issues/16](https://github.com/haxqer/confluence/issues/16) )
99

1010
## 环境要求
@@ -42,7 +42,7 @@
4242
- 启动 confluence
4343

4444
```
45-
docker volume create confluence_home_data && docker network create confluence-network && docker run -p 8090:8090 -v confluence_home_data:/var/confluence --network confluence-network --name confluence-srv -e TZ='Asia/Shanghai' haxqer/confluence:8.5.2
45+
docker volume create confluence_home_data && docker network create confluence-network && docker run -p 8090:8090 -v confluence_home_data:/var/confluence --network confluence-network --name confluence-srv -e TZ='Asia/Shanghai' haxqer/confluence:8.6.1
4646
```
4747

4848
- 然后配置你的数据库:
@@ -52,6 +52,7 @@
5252

5353
```
5454
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
55+
-d \
5556
-p conf \
5657
-m Hello@world.com \
5758
-n Hello@world.com \
@@ -68,6 +69,7 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
6869

6970
```
7071
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
72+
-d \
7173
-p eu.softwareplant.biggantt \
7274
-m Hello@world.com \
7375
-n Hello@world.com \
@@ -77,19 +79,6 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
7779

7880
4. 最后粘贴生成的 licence
7981

80-
## `Datacenter` license
81-
82-
添加 `-d` 参数即可生成 `datacenter` license
83-
84-
```
85-
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
86-
-d \
87-
-p conf \
88-
-m Hello@world.com \
89-
-n Hello@world.com \
90-
-o your-org \
91-
-s you-server-id-xxxx
92-
```
9382

9483
## How to upgrade
9584

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.4'
22
services:
33
confluence:
4-
image: haxqer/confluence:8.5.2
4+
image: haxqer/confluence:8.6.1
55
container_name: confluence-srv
66
environment:
77
- TZ=Asia/Shanghai

0 commit comments

Comments
 (0)