From 2f789b4c4f1ca614094c4de632635c3aeef144b1 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Mon, 28 Aug 2017 18:09:28 +0300
Subject: [PATCH] XDOCKER-32: Upgrade stable version to 9.7
---
9/mysql-tomcat/.env | 2 +-
9/mysql-tomcat/Dockerfile | 4 ++--
9/postgres-tomcat/.env | 2 +-
9/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index ee93b70..9a20c51 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.6
+XWIKI_VERSION=9.7
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 636e16a..33ee80c 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/mysql-tomcat/Dockerfile
@@ -42,9 +42,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=9.6
+ENV XWIKI_VERSION=9.7
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e702fc39a957d3567423ea91a5212c57b1c8c2fabe76a5b0f59e215b013cdb4c
+ENV XWIKI_DOWNLOAD_SHA256 511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/9/postgres-tomcat/.env b/9/postgres-tomcat/.env
index 4fdac8b..ef14354 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.6
+XWIKI_VERSION=9.7
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index f597ee8..a82d9fd 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/postgres-tomcat/Dockerfile
@@ -42,9 +42,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=9.6
+ENV XWIKI_VERSION=9.7
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 e702fc39a957d3567423ea91a5212c57b1c8c2fabe76a5b0f59e215b013cdb4c
+ENV XWIKI_DOWNLOAD_SHA256 511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418
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 857d68d..3563a1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
],
'9' : [
- xwikiVersion: '9.6',
- xwikiSha256: 'e702fc39a957d3567423ea91a5212c57b1c8c2fabe76a5b0f59e215b013cdb4c'
+ xwikiVersion: '9.7',
+ xwikiSha256: '511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418'
]
]
--
GitLab