From 81b84561fa7fc1fdd661afbbfa246c1f120770a6 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Fri, 21 Apr 2017 11:03:07 +0200
Subject: [PATCH] XDOCKER-22: Upgrade stable version to 9.2

---
 8/mysql-tomcat/Dockerfile    | 3 ---
 8/postgres-tomcat/Dockerfile | 3 ---
 9/mysql-tomcat/.env          | 2 +-
 9/mysql-tomcat/Dockerfile    | 7 ++-----
 9/postgres-tomcat/.env       | 2 +-
 9/postgres-tomcat/Dockerfile | 7 ++-----
 build.gradle                 | 8 ++++++--
 template/Dockerfile          | 3 ---
 8 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/8/mysql-tomcat/Dockerfile b/8/mysql-tomcat/Dockerfile
index c7865c7..434b463 100644
--- a/8/mysql-tomcat/Dockerfile
+++ b/8/mysql-tomcat/Dockerfile
@@ -44,9 +44,6 @@ RUN apt-get update && \
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=8.4.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
 ENV XWIKI_DOWNLOAD_SHA256 b414edb4527e3d8b27c40a8c3f2f09423980de7963207b7dc89da71d14e7fb23
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/8/postgres-tomcat/Dockerfile b/8/postgres-tomcat/Dockerfile
index 3297dfa..038a07e 100644
--- a/8/postgres-tomcat/Dockerfile
+++ b/8/postgres-tomcat/Dockerfile
@@ -44,9 +44,6 @@ RUN apt-get update && \
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=8.4.4
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
 ENV XWIKI_DOWNLOAD_SHA256 b414edb4527e3d8b27c40a8c3f2f09423980de7963207b7dc89da71d14e7fb23
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index 9fece4e..a200b0b 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.1.2
+XWIKI_VERSION=9.2
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 97b0ae1..b1d1e35 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/mysql-tomcat/Dockerfile
@@ -42,12 +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.1.2
+ENV XWIKI_VERSION=9.2
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
-ENV XWIKI_DOWNLOAD_SHA256 580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075
+ENV XWIKI_DOWNLOAD_SHA256 7fc737b26cd8a73e3661cc3ed9bfb6cc565538915d665498df1a33a90209b238
 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 c25c2eb..f0dea98 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.1.2
+XWIKI_VERSION=9.2
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index 81b2879..e05870d 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/postgres-tomcat/Dockerfile
@@ -42,12 +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.1.2
+ENV XWIKI_VERSION=9.2
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
-ENV XWIKI_DOWNLOAD_SHA256 580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075
+ENV XWIKI_DOWNLOAD_SHA256 7fc737b26cd8a73e3661cc3ed9bfb6cc565538915d665498df1a33a90209b238
 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 8158897..d650a30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,14 +29,18 @@ defaultTasks 'generate'
 
 def variants = ['mysql-tomcat', 'postgres-tomcat']
 
+// Note: To compute the sha256, download the binary and issue:
+// - Unix: sha256sum <binary name>
+// - Mac: shasum --algorithm 256 <binary name>
+
 def tokens = [
     '8' : [
         xwikiVersion: '8.4.4',
         xwikiSha256: 'b414edb4527e3d8b27c40a8c3f2f09423980de7963207b7dc89da71d14e7fb23'
     ],
     '9' : [
-        xwikiVersion: '9.1.2',
-        xwikiSha256: '580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075'
+        xwikiVersion: '9.2',
+        xwikiSha256: '7fc737b26cd8a73e3661cc3ed9bfb6cc565538915d665498df1a33a90209b238'
     ]
 ]
 
diff --git a/template/Dockerfile b/template/Dockerfile
index 4e9d639..c5b2fb6 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -45,9 +45,6 @@ RUN apt-get update && \\
 # Configure the XWiki permanent directory
 ENV XWIKI_VERSION=$xwikiVersion
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/enterprise/xwiki-enterprise-web/\${XWIKI_VERSION}"
-# Note: To compute the sha256, download the binary and issue:
-# - Unix: sha256sum <binary name>
-# - Mac: shasum --algorithm 256 <binary name>
 ENV XWIKI_DOWNLOAD_SHA256 $xwikiSha256
 RUN rm -rf /usr/local/tomcat/webapps/* && \\
   mkdir -p /usr/local/tomcat/temp && \\
-- 
GitLab