confluence version upgrade to 7.14.1

Dockerfile

@@ -1,7 +1,7 @@
-FROM adoptopenjdk/openjdk8:alpine
+FROM adoptopenjdk/openjdk8:alpine-jre
 # this image already contains glibc
 
-ARG CONFLUENCE_VERSION=7.12.5
+ARG CONFLUENCE_VERSION=7.14.1
 
 # permissions
 ARG CONTAINER_UID=1000
@@ -81,7 +81,7 @@ RUN export CONTAINER_USER=confluence                        && \
     cp /tmp/mysql-connector-java-${MYSQL_DRIVER_VERSION}/mysql-connector-java-${MYSQL_DRIVER_VERSION}-bin.jar      \
       ${CONF_INSTALL}/lib/mysql-connector-java-${MYSQL_DRIVER_VERSION}-bin.jar                                  && \
     chown -R confluence:confluence ${CONF_INSTALL}                                                              && \
-    export KEYSTORE=$JAVA_HOME/jre/lib/security/cacerts                                                             && \
+    export KEYSTORE=$JAVA_HOME/lib/security/cacerts                                                             && \
     wget -P /tmp/ https://letsencrypt.org/certs/letsencryptauthorityx1.der                                      && \
     wget -P /tmp/ https://letsencrypt.org/certs/letsencryptauthorityx2.der                                      && \
     wget -P /tmp/ https://letsencrypt.org/certs/lets-encrypt-x1-cross-signed.der                                && \

README.md

@@ -6,7 +6,7 @@
 
 | Product |Version | Tags  | Dockerfile |
 |---------|--------|-------|------------|
-| Confluence | 7.11.6 | 7.11.6, latest | [Dockerfile](https://github.com/teamatldocker/confluence/blob/master/Dockerfile) |
+| Confluence | 7.14.1 | 7.14.1, latest | [Dockerfile](https://github.com/teamatldocker/confluence/blob/master/Dockerfile) |
 
 # Related Images
 
@@ -97,7 +97,7 @@ $ docker run --name postgres -d \
     -e 'POSTGRES_DB=confluencedb' \
     -e 'POSTGRES_USER=confluencedb' \
     -e 'POSTGRES_PASSWORD=jellyfish' \
-    postgres:9.4
+    postgres:10-alpine
 ~~~~
 
 > This is the official postgres image.
@@ -111,7 +111,7 @@ $ docker run --name postgres -d \
     -e 'DB_USER=confluencedb' \
     -e 'DB_PASS=jellyfish' \
     -e 'DB_NAME=confluencedb' \
-    sameersbn/postgresql:9.4-12
+    sameersbn/postgresql:10-alpine
 ~~~~
 
 > This is the sameersbn/postgresql docker container I tested.
@@ -151,7 +151,7 @@ $ docker run -d --name mysql \
     -e 'MYSQL_DATABASE=confluencedb' \
     -e 'MYSQL_USER=confluencedb' \
     -e 'MYSQL_PASSWORD=jellyfish' \
-    mysql:5.6
+    mysql:5.7
 ~~~~
 
 > This is the mysql docker container I tested.
@@ -165,7 +165,7 @@ $ docker run -d --name mysql \
     -e 'ON_CREATE_DB=confluencedb' \
     -e 'MYSQL_USER=confluencedb' \
     -e 'MYSQL_PASS=jellyfish' \
-    tutum/mysql:5.6
+    tutum/mysql:5.7
 ~~~~
 
 > This is the tutum/mysql docker container I tested.
@@ -230,7 +230,7 @@ $ docker run --name postgres -d \
     -e 'POSTGRES_ENCODING=UTF8' \
     -e 'POSTGRES_COLLATE=C' \
     -e 'POSTGRES_COLLATE_TYPE=C' \
-    postgres
+    postgres:10-alpine
 ~~~~
 
 > Confluence will start after postgres is available!

buildscripts/release.sh

@@ -3,4 +3,4 @@
 #------------------
 # CONTAINER VARIABLES
 #------------------
-export CONFLUENCE_VERSION=7.11.6
+export CONFLUENCE_VERSION=7.14.1

buildscripts/testImage.sh

@@ -6,7 +6,7 @@ function testImage() {
   local tagname=$1
   local iteration=0
   docker run -d --network confluence_dockertestnet --name=confluence.$tagname teamatldocker/confluence:$tagname
-  while ! docker run --rm --network confluence_dockertestnet tutum/curl curl http://confluence.$tagname:8090
+  while ! docker run --rm --network confluence_dockertestnet appropriate/curl curl http://confluence.$tagname:8090
   do
       { echo "Exit status of curl (${iteration}): $?"
         echo "Retrying ..."

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - 'CONFLUENCE_DELAYED_START='
 
   postgresql:
-    image: postgres:9.5-alpine
+    image: postgres:10-alpine
     container_name: postgres
     hostname: postgres
     networks: