From 691c39ff7a15fb904556d2c849d517b8f739bd77 Mon Sep 17 00:00:00 2001 From: Vincent Massol <vincent@massol.net> Date: Tue, 23 Apr 2019 16:58:08 +0200 Subject: [PATCH] XDOCKER-105: Upgrade LTS to 10.11.7 --- 10/mysql-tomcat/.env | 2 +- 10/mysql-tomcat/Dockerfile | 4 ++-- 10/postgres-tomcat/.env | 2 +- 10/postgres-tomcat/Dockerfile | 4 ++-- build.gradle | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/10/mysql-tomcat/.env b/10/mysql-tomcat/.env index 21781d9..0201efb 100644 --- a/10/mysql-tomcat/.env +++ b/10/mysql-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=10.11.6 +XWIKI_VERSION=10.11.7 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile index 33f390e..fc8d60b 100644 --- a/10/mysql-tomcat/Dockerfile +++ b/10/mysql-tomcat/Dockerfile @@ -44,9 +44,9 @@ RUN apt-get update && \ # Install XWiki as the ROOT webapp context in Tomcat # Create the Tomcat temporary directory # Configure the XWiki permanent directory -ENV XWIKI_VERSION=10.11.6 +ENV XWIKI_VERSION=10.11.7 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 efd7ab92a19aa2f272b34365e809b703a47f901e021044e3c32a657b60b70d71 +ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5 RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ diff --git a/10/postgres-tomcat/.env b/10/postgres-tomcat/.env index 2649ff4..9cbf865 100644 --- a/10/postgres-tomcat/.env +++ b/10/postgres-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=10.11.6 +XWIKI_VERSION=10.11.7 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile index 33e0c4d..98d1625 100644 --- a/10/postgres-tomcat/Dockerfile +++ b/10/postgres-tomcat/Dockerfile @@ -44,9 +44,9 @@ RUN apt-get update && \ # Install XWiki as the ROOT webapp context in Tomcat # Create the Tomcat temporary directory # Configure the XWiki permanent directory -ENV XWIKI_VERSION=10.11.6 +ENV XWIKI_VERSION=10.11.7 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 efd7ab92a19aa2f272b34365e809b703a47f901e021044e3c32a657b60b70d71 +ENV XWIKI_DOWNLOAD_SHA256 d343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5 RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ diff --git a/build.gradle b/build.gradle index 8c846bb..c97071b 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,8 @@ def variants = ['mysql-tomcat', 'postgres-tomcat'] def tokens = [ '10' : [ - xwikiVersion: '10.11.6', - xwikiSha256: 'efd7ab92a19aa2f272b34365e809b703a47f901e021044e3c32a657b60b70d71' + xwikiVersion: '10.11.7', + xwikiSha256: 'd343f5bd178d8462ecc7cc53efd26727d314a1905b8fc21cefbb297abe47ecd5' ], '11': [ xwikiVersion: '11.2', -- GitLab