From f4098b37621ba16271010543363fb872885608ac Mon Sep 17 00:00:00 2001
From: Guillaume Delhumeau <guillaume.delhumeau@xwiki.com>
Date: Sun, 22 Jul 2018 17:59:48 +0200
Subject: [PATCH] XDOCKER-66: Upgrade stable version to 10.6.1.
---
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 8849355..18489d1 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.6
+XWIKI_VERSION=10.6.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index ef46551..d42065a 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.6
+ENV XWIKI_VERSION=10.6.1
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 36be1fb0f01691d585bd2005cac561ded783c55a98009933e72b76a2574decc2
+ENV XWIKI_DOWNLOAD_SHA256 fcc79469e95881cdbf04c85edf1c26ba9fa52eb107de1efdb8f426ace0f0cb10
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 5deeac8..a5a0b2c 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.6
+XWIKI_VERSION=10.6.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 8815ff0..30e0568 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.6
+ENV XWIKI_VERSION=10.6.1
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 36be1fb0f01691d585bd2005cac561ded783c55a98009933e72b76a2574decc2
+ENV XWIKI_DOWNLOAD_SHA256 fcc79469e95881cdbf04c85edf1c26ba9fa52eb107de1efdb8f426ace0f0cb10
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 50b46d5..d59654c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '3102643408f3db9e0d1a82f7586afecb02d0a186e8314ff32c76e4ed23d83afe'
],
'10': [
- xwikiVersion: '10.6',
- xwikiSha256: '36be1fb0f01691d585bd2005cac561ded783c55a98009933e72b76a2574decc2'
+ xwikiVersion: '10.6.1',
+ xwikiSha256: 'fcc79469e95881cdbf04c85edf1c26ba9fa52eb107de1efdb8f426ace0f0cb10'
]
]
--
GitLab