From 02e12b746e3029ab4edf0ecedb2d4a1fe3f623c8 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Thu, 28 Sep 2017 10:07:57 +0200
Subject: [PATCH] XDOCKER-34: Upgrade stable version to 9.8
---
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 9a20c51..69c86b5 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.7
+XWIKI_VERSION=9.8
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 32ef046..608b358 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/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=9.7
+ENV XWIKI_VERSION=9.8
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418
+ENV XWIKI_DOWNLOAD_SHA256 f416d4fccf6f766c902483b2cbc56236924c62ba2f5513128026c65f8d163ae2
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 ef14354..eb9ec94 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.7
+XWIKI_VERSION=9.8
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index c13a3f5..5dc282c 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/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=9.7
+ENV XWIKI_VERSION=9.8
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418
+ENV XWIKI_DOWNLOAD_SHA256 f416d4fccf6f766c902483b2cbc56236924c62ba2f5513128026c65f8d163ae2
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 3563a1a..8317a00 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
],
'9' : [
- xwikiVersion: '9.7',
- xwikiSha256: '511edf81e9776b627d1a8aa200f6e377ab75c1821d7360d77a27092ad1ebf418'
+ xwikiVersion: '9.8',
+ xwikiSha256: 'f416d4fccf6f766c902483b2cbc56236924c62ba2f5513128026c65f8d163ae2'
]
]
--
GitLab