.gitignore

@@ -0,0 +1,5 @@
+.settings/
+.project
+.idea/
+.git/
+.DS_Store

Dockerfile

@@ -1,32 +1,34 @@
-FROM openjdk:8-stretch
+FROM openjdk:17-bullseye
 
-LABEL maintainer="haxqer <haxqer666@gmail.com>" version="7.6.2"
+LABEL maintainer="haxqer <haxqer666@gmail.com>" version="9.2.1"
 
 ARG ATLASSIAN_PRODUCTION=confluence
 ARG APP_NAME=confluence
-ARG APP_VERSION=7.6.2
-ARG AGENT_VERSION=1.2.2
-ARG MYSQL_DRIVER_VERSION=5.1.48
+ARG APP_VERSION=9.2.1
+ARG AGENT_VERSION=1.3.3
+ARG MYSQL_DRIVER_VERSION=8.0.22
 
 ENV CONFLUENCE_HOME=/var/confluence \
     CONFLUENCE_INSTALL=/opt/confluence \
-    JVM_MINIMUM_MEMORY=1g \
-    JVM_MAXIMUM_MEMORY=3g \
-    JVM_CODE_CACHE_ARGS='-XX:InitialCodeCacheSize=1g -XX:ReservedCodeCacheSize=2g' \
+    JVM_MINIMUM_MEMORY=4g \
+    JVM_MAXIMUM_MEMORY=16g \
+    JVM_CODE_CACHE_ARGS='-XX:InitialCodeCacheSize=2g -XX:ReservedCodeCacheSize=4g' \
     AGENT_PATH=/var/agent \
-    AGENT_FILENAME=atlassian-agent.jar
+    AGENT_FILENAME=atlassian-agent.jar \
+    LIB_PATH=/confluence/WEB-INF/lib
 
 ENV JAVA_OPTS="-javaagent:${AGENT_PATH}/${AGENT_FILENAME} ${JAVA_OPTS}"
 
-RUN mkdir -p ${CONFLUENCE_INSTALL} ${CONFLUENCE_HOME} ${AGENT_PATH} \
+RUN mkdir -p ${CONFLUENCE_INSTALL} ${CONFLUENCE_HOME} ${AGENT_PATH} ${CONFLUENCE_INSTALL}${LIB_PATH} \
 && curl -o ${AGENT_PATH}/${AGENT_FILENAME}  https://github.com/haxqer/confluence/releases/download/v${AGENT_VERSION}/atlassian-agent.jar -L \
 && curl -o /tmp/atlassian.tar.gz https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-${APP_NAME}-${APP_VERSION}.tar.gz -L \
 && tar xzf /tmp/atlassian.tar.gz -C /opt/confluence/ --strip-components 1 \
 && rm -f /tmp/atlassian.tar.gz \
-&& curl -o /opt/confluence/lib/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_DRIVER_VERSION}/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar -L \
+&& curl -o ${CONFLUENCE_INSTALL}/lib/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_DRIVER_VERSION}/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar -L \
+&& cp ${CONFLUENCE_INSTALL}/lib/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar ${CONFLUENCE_INSTALL}${LIB_PATH}/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar \
 && echo "confluence.home = ${CONFLUENCE_HOME}" > ${CONFLUENCE_INSTALL}/${ATLASSIAN_PRODUCTION}/WEB-INF/classes/confluence-init.properties
 
 WORKDIR $CONFLUENCE_INSTALL
 EXPOSE 8090
 
-ENTRYPOINT ["/opt/confluence/bin/start-confluence.sh", "-fg"]
+ENTRYPOINT ["/opt/confluence/bin/start-confluence.sh", "-fg"]

README.md

@@ -1,6 +1,26 @@
 # confluence
+
+
+New Confluence/Jira releases support only Data Center licenses. To generate a Data Center licenses, add the `-d` parameter.
+
+---
+Please be sure to upgrade to the latest version(9.2.1 or 8.5.19), as this [bug](https://confluence.atlassian.com/security/cve-2023-22518-improper-authorization-vulnerability-in-confluence-data-center-and-server-1311473907.html).
+
+Related issues:
++ [#38](https://github.com/haxqer/confluence/issues/38)
++ [#39](https://github.com/haxqer/confluence/issues/39)
++ [#46](https://github.com/haxqer/confluence/issues/46) (Thanks to: [pldavid2](https://github.com/pldavid2))
+
+---
+[README](README.md) | [中文文档](README_zh.md)
+
 default port: 8090
 
++ Latest Version(arm64&amd64): v8(8.9.8) v9(9.2.1)
++ LTS Version:(arm64&amd64) v8(8.5.19)
++ [The new way](https://github.com/haxqer/confluence/tree/build-your-own) of use allows you to conveniently upgrade and modify parameters on your own, and it offers convenient support for HTTPS (thanks to [xsharp](https://github.com/xsharp)).
++ 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) )
+
 ## Requirement
 - docker-compose: 17.09.0+
 
@@ -9,34 +29,34 @@ default port: 8090
 - start confluence & mysql
 
 ```
-    git clone https://github.com/haxqer/confluence.git \
-        && cd confluence \
-        && docker-compose up
+git clone https://github.com/haxqer/confluence.git \
+    && cd confluence \
+    && docker-compose up
 ```
 
 - start confluence & mysql daemon
 
 ```
-    docker-compose up -d
+docker-compose up -d
 ```
 
-- default db(mysql5.7) configure:
+- default db(mysql8.0) configure:
 
 ```bash
-    driver=mysql5.7+
-    host=mysql-confluence
-    port=3306
-    db=confluence
-    user=confluence
-    passwd=123123
+driver=mysql
+host=mysql-confluence
+port=3306
+db=confluence
+user=root
+passwd=123456
 ```
 
 ## How to run with docker
 
 - start confluence
 
 ```
-    docker run -p 8090:8090 -v ./confluence:/var/confluence --network confluence-network --name confluence-srv -e TZ='Asia/Shanghai' haxqer/confluence
+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:9.2.1
 ```
 
 - config your own db:
@@ -46,10 +66,11 @@ default port: 8090
 
 ```
 docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
+    -d \
     -p conf \
-    -m haxqer666@gmail.com \
-    -n haxqer666@gmail.com \
-    -o http://website \
+    -m Hello@world.com \
+    -n Hello@world.com \
+    -o your-org \
     -s you-server-id-xxxx
 ```
 
@@ -62,34 +83,28 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
 
 ```
 docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
+    -d \
     -p eu.softwareplant.biggantt \
-    -m haxqer666@gmail.com \
-    -n haxqer666@gmail.com \
-    -o http://website \
+    -m Hello@world.com \
+    -n Hello@world.com \
+    -o your-org \
     -s you-server-id-xxxx
 ```
 
-4. Paste your license 
+4. Paste your license
 
-## Install docker & docker-compose
-- If you use `debian`, just do it.
-```
-    ./script/debian-install-docker.sh
-    ./script/linux-install-docker-compose.sh
-```
-
-## Set Proxy
 
-path : `~/.docker/config.json`
+## How to upgrade
 
-content : 
+```shell
+cd confluence && git pull
+docker pull haxqer/confluence:latest && docker-compose stop
+docker-compose rm
 ```
-{
-    "proxies": {
-        "default": {
-         "httpProxy": "http://ip:port",
-         "httpsProxy": "http://ip:port"
-        }
-    }
-}
+
+enter `y`, then start server
+
+```shell
+docker-compose up -d
 ```
+

README_zh.md

@@ -0,0 +1,109 @@
+# confluence
+
+新的Confluence/Jira版本仅支持数据中心许可证
+
+---
+请务必升级到最新版(9.2.1 或者 8.5.19)，因为 confluence 的这个 [bug](https://confluence.atlassian.com/security/cve-2023-22518-improper-authorization-vulnerability-in-confluence-data-center-and-server-1311473907.html).
+
+相关的 issues:
++ [#38](https://github.com/haxqer/confluence/issues/38)
++ [#39](https://github.com/haxqer/confluence/issues/39)
+
+---
+
+[README](README.md) | [中文文档](README_zh.md)
+
+默认端口: 8090
+
++ 最新版本(arm64&amd64): v8(8.9.8) v9(9.2.1)
++ 长期维护的版本(arm64&amd64): v8(8.5.19)
++ [新的使用方式](https://github.com/haxqer/confluence/tree/build-your-own) ，您可方便自行升级、修改各参数，支持https (感谢 [xsharp](https://github.com/xsharp)).
++ 最新的修复中文乱码问题的版本: [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) )
+
+## 环境要求
+- docker-compose: 17.09.0+
+
+## 使用 docker-compose 启动
+
+- start confluence & mysql
+
+```
+    git clone https://github.com/haxqer/confluence.git \
+        && cd confluence \
+        && docker-compose up
+```
+
+- 以守护进程的方式启动 confluence & mysql
+
+```
+    docker-compose up -d
+```
+
+- 默认的 数据库(mysql8.0) 配置:
+
+```bash
+    driver=mysql
+    host=mysql-confluence
+    port=3306
+    db=confluence
+    user=root
+    passwd=123456
+```
+
+## 使用 docker 启动
+
+- 启动 confluence
+
+```
+    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:9.2.1
+```
+
+- 然后配置你的数据库:
+
+
+## 破解 confluence
+
+```
+docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
+    -d \
+    -p conf \
+    -m Hello@world.com \
+    -n Hello@world.com \
+    -o your-org \
+    -s you-server-id-xxxx
+```
+
+## 破解 confluence 的插件
+
+- 例如: 你想要破解 BigGantt 插件
+1. 从 confluence marketplace 中安装 BigGantt 插件
+2. 查看 BigGantt 的 `App Key` 是 : `eu.softwareplant.biggantt`
+3. 然后执行 :
+
+```
+docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
+    -d \
+    -p eu.softwareplant.biggantt \
+    -m Hello@world.com \
+    -n Hello@world.com \
+    -o your-org \
+    -s you-server-id-xxxx
+```
+
+4. 最后粘贴生成的 licence
+
+
+## How to upgrade
+
+```shell
+cd confluence && git pull
+docker pull haxqer/confluence:latest && docker-compose stop
+docker-compose rm
+```
+
+enter `y`, then start server
+
+```shell
+docker-compose up -d
+```
+

confluence_lts/Dockerfile

@@ -0,0 +1,34 @@
+FROM openjdk:11-bullseye
+
+LABEL maintainer="haxqer <haxqer666@gmail.com>" version="8.5.19"
+
+ARG ATLASSIAN_PRODUCTION=confluence
+ARG APP_NAME=confluence
+ARG APP_VERSION=8.5.19
+ARG AGENT_VERSION=1.3.3
+ARG MYSQL_DRIVER_VERSION=8.0.22
+
+ENV CONFLUENCE_HOME=/var/confluence \
+    CONFLUENCE_INSTALL=/opt/confluence \
+    JVM_MINIMUM_MEMORY=4g \
+    JVM_MAXIMUM_MEMORY=16g \
+    JVM_CODE_CACHE_ARGS='-XX:InitialCodeCacheSize=2g -XX:ReservedCodeCacheSize=4g' \
+    AGENT_PATH=/var/agent \
+    AGENT_FILENAME=atlassian-agent.jar \
+    LIB_PATH=/confluence/WEB-INF/lib
+
+ENV JAVA_OPTS="-javaagent:${AGENT_PATH}/${AGENT_FILENAME} ${JAVA_OPTS}"
+
+RUN mkdir -p ${CONFLUENCE_INSTALL} ${CONFLUENCE_HOME} ${AGENT_PATH} ${CONFLUENCE_INSTALL}${LIB_PATH} \
+&& curl -o ${AGENT_PATH}/${AGENT_FILENAME}  https://github.com/haxqer/confluence/releases/download/v${AGENT_VERSION}/atlassian-agent.jar -L \
+&& curl -o /tmp/atlassian.tar.gz https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-${APP_NAME}-${APP_VERSION}.tar.gz -L \
+&& tar xzf /tmp/atlassian.tar.gz -C /opt/confluence/ --strip-components 1 \
+&& rm -f /tmp/atlassian.tar.gz \
+&& curl -o ${CONFLUENCE_INSTALL}/lib/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/${MYSQL_DRIVER_VERSION}/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar -L \
+&& cp ${CONFLUENCE_INSTALL}/lib/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar ${CONFLUENCE_INSTALL}${LIB_PATH}/mysql-connector-java-${MYSQL_DRIVER_VERSION}.jar \
+&& echo "confluence.home = ${CONFLUENCE_HOME}" > ${CONFLUENCE_INSTALL}/${ATLASSIAN_PRODUCTION}/WEB-INF/classes/confluence-init.properties
+
+WORKDIR $CONFLUENCE_INSTALL
+EXPOSE 8090
+
+ENTRYPOINT ["/opt/confluence/bin/start-confluence.sh", "-fg"]

confluence_lts/docker-compose.yml

@@ -0,0 +1,45 @@
+version: '3.4'
+services:
+  confluence:
+    image: haxqer/confluence:8.5.19
+    container_name: confluence-srv
+    environment:
+      - TZ=Asia/Shanghai
+    #      - JVM_MINIMUM_MEMORY=1g
+    #      - JVM_MAXIMUM_MEMORY=12g
+    #      - JVM_CODE_CACHE_ARGS='-XX:InitialCodeCacheSize=1g -XX:ReservedCodeCacheSize=8g'
+    depends_on:
+      - mysql
+    ports:
+      - "8090:8090"
+    volumes:
+      - home_data:/var/confluence
+    restart: always
+    networks:
+      - network-bridge
+
+  mysql:
+    image: mysql:8.0
+    container_name: mysql-confluence
+    environment:
+      - TZ=Asia/Shanghai
+      - MYSQL_DATABASE=confluence
+      - MYSQL_ROOT_PASSWORD=123456
+      - MYSQL_USER=confluence
+      - MYSQL_PASSWORD=123123
+    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']
+    volumes:
+      - mysql_data:/var/lib/mysql
+    restart: always
+    networks:
+      - network-bridge
+
+networks:
+  network-bridge:
+    driver: bridge
+
+volumes:
+  home_data:
+    external: false
+  mysql_data:
+    external: false

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   confluence:
-    image: haxqer/confluence
+    image: haxqer/confluence:9.2.1
     container_name: confluence-srv
     environment:
       - TZ=Asia/Shanghai
@@ -13,27 +13,33 @@ services:
     ports:
       - "8090:8090"
     volumes:
-      - ./confluence:/var/confluence
+      - home_data:/var/confluence
     restart: always
     networks:
       - network-bridge
 
   mysql:
-    image: mysql:5.7
+    image: mysql:8.0
     container_name: mysql-confluence
     environment:
       - TZ=Asia/Shanghai
       - MYSQL_DATABASE=confluence
       - MYSQL_ROOT_PASSWORD=123456
       - MYSQL_USER=confluence
       - MYSQL_PASSWORD=123123
-    command: ['mysqld', '--character-set-server=utf8', '--collation-server=utf8_bin', '--transaction-isolation=READ-COMMITTED', '--innodb_log_file_size=256M', '--max_allowed_packet=256M']
+    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']
     volumes:
-      - ./mysql:/var/lib/mysql
+      - mysql_data:/var/lib/mysql
     restart: always
     networks:
       - network-bridge
 
 networks:
   network-bridge:
-    driver: bridge
+    driver: bridge
+
+volumes:
+  home_data:
+    external: false
+  mysql_data:
+    external: false