to 7.6.2

Dockerfile

@@ -1,12 +1,12 @@
-FROM openjdk:11-stretch
+FROM openjdk:8-stretch
 
-LABEL maintainer="axlroden <alex@axlrod.dk>" version="7.17.0"
+LABEL maintainer="haxqer <haxqer666@gmail.com>" version="7.6.2"
 
 ARG ATLASSIAN_PRODUCTION=confluence
 ARG APP_NAME=confluence
-ARG APP_VERSION=7.17.0
-ARG AGENT_VERSION=1.3.1
-ARG MYSQL_DRIVER_VERSION=8.0.28
+ARG APP_VERSION=7.6.2
+ARG AGENT_VERSION=1.2.2
+ARG MYSQL_DRIVER_VERSION=5.1.48
 
 ENV CONFLUENCE_HOME=/var/confluence \
     CONFLUENCE_INSTALL=/opt/confluence \
@@ -19,9 +19,7 @@ ENV CONFLUENCE_HOME=/var/confluence \
 ENV JAVA_OPTS="-javaagent:${AGENT_PATH}/${AGENT_FILENAME} ${JAVA_OPTS}"
 
 RUN mkdir -p ${CONFLUENCE_INSTALL} ${CONFLUENCE_HOME} ${AGENT_PATH} \
-&& curl -o ${AGENT_PATH}/agent.tar.gz https://gitee.com/pengzhile/atlassian-agent/attach_files/832832/download/atlassian-agent-v${AGENT_VERSION}.tar.gz -L \
-&& tar xzf ${AGENT_PATH}/agent.tar.gz -C ${AGENT_PATH}/ --strip-components 1 \
-&& rm -rf ${AGENT_PATH}/agent.tar.gz \
+&& 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 \
@@ -31,4 +29,4 @@ RUN mkdir -p ${CONFLUENCE_INSTALL} ${CONFLUENCE_HOME} ${AGENT_PATH} \
 WORKDIR $CONFLUENCE_INSTALL
 EXPOSE 8090
 
-ENTRYPOINT ["/opt/confluence/bin/start-confluence.sh", "-fg"]
+ENTRYPOINT ["/opt/confluence/bin/start-confluence.sh", "-fg"]

README.md

@@ -20,10 +20,10 @@ default port: 8090
     docker-compose up -d
 ```
 
-- default db(mysql 8.0.28) configure:
+- default db(mysql5.7) configure:
 
 ```bash
-    driver=mysql8.0.28
+    driver=mysql5.7+
     host=mysql-confluence
     port=3306
     db=confluence
@@ -69,7 +69,7 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
     -s you-server-id-xxxx
 ```
 
-4. Paste your license
+4. Paste your license 
 
 ## Install docker & docker-compose
 - If you use `debian`, just do it.
@@ -82,7 +82,7 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
 
 path : `~/.docker/config.json`
 
-content :
+content : 
 ```
 {
     "proxies": {
@@ -93,4 +93,3 @@ content :
     }
 }
 ```
-

docker-compose.yml

@@ -1,13 +1,13 @@
 version: '3.4'
 services:
   confluence:
-    image: axlroden/confluence
+    image: haxqer/confluence
     container_name: confluence-srv
     environment:
-      - TZ='Europe/Copenhagen'
-      #- JVM_MINIMUM_MEMORY=1g
-      #- JVM_MAXIMUM_MEMORY=12g
-      #- JVM_CODE_CACHE_ARGS='-XX:InitialCodeCacheSize=1g -XX:ReservedCodeCacheSize=8g'
+      - 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:
@@ -19,17 +19,15 @@ services:
       - network-bridge
 
   mysql:
-    image: mysql:8
+    image: mysql:5.7
     container_name: mysql-confluence
     environment:
-      - TZ='Europe/Copenhagen'
+      - TZ=Asia/Shanghai
       - MYSQL_DATABASE=confluence
       - MYSQL_ROOT_PASSWORD=123456
       - MYSQL_USER=confluence
       - MYSQL_PASSWORD=123123
-    cap_add:
-      - SYS_NICE  # CAP_SYS_NICE
-    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']
+    command: ['mysqld', '--character-set-server=utf8', '--collation-server=utf8_bin', '--transaction-isolation=READ-COMMITTED', '--innodb_log_file_size=256M', '--max_allowed_packet=256M']
     volumes:
       - ./mysql:/var/lib/mysql
     restart: always
@@ -38,4 +36,4 @@ services:
 
 networks:
   network-bridge:
-    driver: bridge
+    driver: bridge