Skip to content

Commit bfdfa28

Browse files
committed
upgrade to 8.5.2
1 parent ad29f80 commit bfdfa28

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM openjdk:11-bullseye
22

3-
LABEL maintainer="haxqer <haxqer666@gmail.com>" version="7.19.14"
3+
LABEL maintainer="haxqer <haxqer666@gmail.com>" version="8.5.2"
44

55
ARG ATLASSIAN_PRODUCTION=confluence
66
ARG APP_NAME=confluence
7-
ARG APP_VERSION=7.19.14
7+
ARG APP_VERSION=8.5.2
88
ARG AGENT_VERSION=1.3.3
99
ARG MYSQL_DRIVER_VERSION=8.0.22
1010

README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
default port: 8090
55

6-
+ Long Term Support Version: v7(7.19.14)
7-
+ Latest Version: v8(8.4.2)
6+
+ Latest Version: v8(8.5.2)
87
+ 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) )
98

109
## Requirement
@@ -42,7 +41,7 @@ default port: 8090
4241
- start confluence
4342

4443
```
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:7.19.14
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
4645
```
4746

4847
- config your own db:

README_zh.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44

55
默认端口: 8090
66

7-
+ 长期维护的版本: v7(7.19.14)
8-
+ 最新版本: v8(8.4.2)
9-
+ 最新的修复中文乱码问题的版本: [v8](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) )
7+
+ 最新版本: v8(8.5.2)
8+
+ 最新的修复中文乱码问题的版本: [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) )
109

1110
## 环境要求
1211
- docker-compose: 17.09.0+
@@ -43,7 +42,7 @@
4342
- 启动 confluence
4443

4544
```
46-
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:7.19.14
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
4746
```
4847

4948
- 然后配置你的数据库:

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.4'
22
services:
33
confluence:
4-
image: haxqer/confluence:7.19.14
4+
image: haxqer/confluence:8.5.2
55
container_name: confluence-srv
66
environment:
77
- TZ=Asia/Shanghai
@@ -27,7 +27,7 @@ services:
2727
- MYSQL_ROOT_PASSWORD=123456
2828
- MYSQL_USER=confluence
2929
- MYSQL_PASSWORD=123123
30-
command: ['mysqld', '--character-set-server=utf8', '--collation-server=utf8_bin', '--transaction-isolation=READ-COMMITTED', '--innodb_log_file_size=256M', '--max_allowed_packet=256M','--log_bin_trust_function_creators=1']
30+
command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_bin', '--transaction-isolation=READ-COMMITTED', '--innodb_log_file_size=256M', '--max_allowed_packet=256M','--log_bin_trust_function_creators=1']
3131
volumes:
3232
- mysql_data:/var/lib/mysql
3333
restart: always

0 commit comments

Comments
 (0)