From 478f413940c46b325ad8d2b99e430273966b3981 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Tue, 7 Mar 2017 13:38:01 +0100
Subject: [PATCH] XDOCKER-17: Upgrade stable version to 9.1.2

---
 8/mysql-tomcat/Dockerfile    | 2 +-
 8/postgres-tomcat/Dockerfile | 2 +-
 9/mysql-tomcat/.env          | 2 +-
 9/mysql-tomcat/Dockerfile    | 6 +++---
 9/postgres-tomcat/.env       | 2 +-
 9/postgres-tomcat/Dockerfile | 6 +++---
 build.gradle                 | 4 ++--
 template/Dockerfile          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/8/mysql-tomcat/Dockerfile b/8/mysql-tomcat/Dockerfile
index f01c33c..c7865c7 100644
--- a/8/mysql-tomcat/Dockerfile
+++ b/8/mysql-tomcat/Dockerfile
@@ -46,7 +46,7 @@ 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 25 <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 c4bcb88..3297dfa 100644
--- a/8/postgres-tomcat/Dockerfile
+++ b/8/postgres-tomcat/Dockerfile
@@ -46,7 +46,7 @@ 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 25 <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 e47596a..9fece4e 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.0
+XWIKI_VERSION=9.1.2
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index ee7e19a..97b0ae1 100644
--- a/9/mysql-tomcat/Dockerfile
+++ b/9/mysql-tomcat/Dockerfile
@@ -42,12 +42,12 @@ 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.0
+ENV XWIKI_VERSION=9.1.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 25 <binary name>
-ENV XWIKI_DOWNLOAD_SHA256 faaca2aa1ade07448be944feb39db22131accfe82658463abfd55f93f859cc25
+# - Mac: shasum --algorithm 256 <binary name>
+ENV XWIKI_DOWNLOAD_SHA256 580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075
 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 6162d63..c25c2eb 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
 # Default environment values
-XWIKI_VERSION=9.0
+XWIKI_VERSION=9.1.2
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index 32cfe49..81b2879 100644
--- a/9/postgres-tomcat/Dockerfile
+++ b/9/postgres-tomcat/Dockerfile
@@ -42,12 +42,12 @@ 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.0
+ENV XWIKI_VERSION=9.1.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 25 <binary name>
-ENV XWIKI_DOWNLOAD_SHA256 faaca2aa1ade07448be944feb39db22131accfe82658463abfd55f93f859cc25
+# - Mac: shasum --algorithm 256 <binary name>
+ENV XWIKI_DOWNLOAD_SHA256 580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075
 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 e1119d3..8158897 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,8 +35,8 @@ def tokens = [
         xwikiSha256: 'b414edb4527e3d8b27c40a8c3f2f09423980de7963207b7dc89da71d14e7fb23'
     ],
     '9' : [
-        xwikiVersion: '9.0',
-        xwikiSha256: 'faaca2aa1ade07448be944feb39db22131accfe82658463abfd55f93f859cc25'
+        xwikiVersion: '9.1.2',
+        xwikiSha256: '580190b11bc9f11fde0cf992c0299fff17b5bece7fa5d7d4f7fb53c46e77a075'
     ]
 ]
 
diff --git a/template/Dockerfile b/template/Dockerfile
index 1cfe135..4e9d639 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -47,7 +47,7 @@ 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 25 <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