From 45b890a44c4bdf29c8ac1f3c006b39d3558b053a Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Tue, 28 Aug 2018 09:19:37 +0200
Subject: [PATCH] XDOCKER-70: Upgrade stable version to 10.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 18489d1..563df18 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.6.1
+XWIKI_VERSION=10.7
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index d42065a..ff7ee72 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.1
+ENV XWIKI_VERSION=10.7
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fcc79469e95881cdbf04c85edf1c26ba9fa52eb107de1efdb8f426ace0f0cb10
+ENV XWIKI_DOWNLOAD_SHA256 500965a5e074d6df2e07822db85e551e260c2cf59dfac47dfaeb44687aa4592c
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 a5a0b2c..701580d 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.6.1
+XWIKI_VERSION=10.7
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 30e0568..5dae02b 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.1
+ENV XWIKI_VERSION=10.7
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fcc79469e95881cdbf04c85edf1c26ba9fa52eb107de1efdb8f426ace0f0cb10
+ENV XWIKI_DOWNLOAD_SHA256 500965a5e074d6df2e07822db85e551e260c2cf59dfac47dfaeb44687aa4592c
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 d59654c..add6d51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '3102643408f3db9e0d1a82f7586afecb02d0a186e8314ff32c76e4ed23d83afe'
],
'10': [
- xwikiVersion: '10.6.1',
- xwikiSha256: 'fcc79469e95881cdbf04c85edf1c26ba9fa52eb107de1efdb8f426ace0f0cb10'
+ xwikiVersion: '10.7',
+ xwikiSha256: '500965a5e074d6df2e07822db85e551e260c2cf59dfac47dfaeb44687aa4592c'
]
]
--
GitLab