From ebb7e79fa3f4da7d8a6cb7c8451a08fee2e1d2a3 Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Thu, 30 Nov 2017 16:06:43 +0100
Subject: [PATCH] XDOCKER-42: Upgrade stable version to 9.10.1
---
8/mysql-tomcat/xwiki/docker-entrypoint.sh | 1 +
8/postgres-tomcat/xwiki/docker-entrypoint.sh | 1 +
9/mysql-tomcat/.env | 2 +-
9/mysql-tomcat/Dockerfile | 4 ++--
9/mysql-tomcat/xwiki/docker-entrypoint.sh | 1 +
9/postgres-tomcat/.env | 2 +-
9/postgres-tomcat/Dockerfile | 4 ++--
9/postgres-tomcat/xwiki/docker-entrypoint.sh | 1 +
build.gradle | 4 ++--
9 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/8/mysql-tomcat/xwiki/docker-entrypoint.sh b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
index 1eb26e3..6934f79 100755
--- a/8/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -93,6 +93,7 @@ function configure() {
xwiki_set_cfg 'xwiki.store.attachment.hint' 'file'
xwiki_set_cfg 'xwiki.store.attachment.versioning.hint' 'file'
xwiki_set_cfg 'xwiki.store.attachment.recyclebin.hint' 'file'
+
echo ' Generating authentication validation and encryption keys...'
xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
diff --git a/8/postgres-tomcat/xwiki/docker-entrypoint.sh b/8/postgres-tomcat/xwiki/docker-entrypoint.sh
index 1eb26e3..6934f79 100755
--- a/8/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/8/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -93,6 +93,7 @@ function configure() {
xwiki_set_cfg 'xwiki.store.attachment.hint' 'file'
xwiki_set_cfg 'xwiki.store.attachment.versioning.hint' 'file'
xwiki_set_cfg 'xwiki.store.attachment.recyclebin.hint' 'file'
+
echo ' Generating authentication validation and encryption keys...'
xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env
index 773ee9c..dae8ef9 100644
--- a/9/mysql-tomcat/.env
+++ b/9/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.10
+XWIKI_VERSION=9.10.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile
index 76f5af9..2cd7df5 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.10
+ENV XWIKI_VERSION=9.10.1
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64
+ENV XWIKI_DOWNLOAD_SHA256 36d139b4fc92b712e6c29ac0533d08cea7193cecd8144fc0584f422178379ccd
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/9/mysql-tomcat/xwiki/docker-entrypoint.sh b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
index 4261f22..6e733af 100755
--- a/9/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -95,6 +95,7 @@ function configure() {
xwiki_set_cfg 'xwiki.store.attachment.recyclebin.content.hint' 'file'
echo ' Using filesystem-based deleted documents...'
xwiki_set_cfg 'xwiki.store.recyclebin.content.hint' 'file'
+
echo ' Generating authentication validation and encryption keys...'
xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
diff --git a/9/postgres-tomcat/.env b/9/postgres-tomcat/.env
index 24c2353..40c8746 100644
--- a/9/postgres-tomcat/.env
+++ b/9/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=9.10
+XWIKI_VERSION=9.10.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile
index cdcb340..060aced 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.10
+ENV XWIKI_VERSION=9.10.1
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64
+ENV XWIKI_DOWNLOAD_SHA256 36d139b4fc92b712e6c29ac0533d08cea7193cecd8144fc0584f422178379ccd
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/xwiki/docker-entrypoint.sh b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
index 4261f22..6e733af 100755
--- a/9/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -95,6 +95,7 @@ function configure() {
xwiki_set_cfg 'xwiki.store.attachment.recyclebin.content.hint' 'file'
echo ' Using filesystem-based deleted documents...'
xwiki_set_cfg 'xwiki.store.recyclebin.content.hint' 'file'
+
echo ' Generating authentication validation and encryption keys...'
xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
diff --git a/build.gradle b/build.gradle
index b0ee795..39a2e85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9'
],
'9' : [
- xwikiVersion: '9.10',
- xwikiSha256: 'a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64'
+ xwikiVersion: '9.10.1',
+ xwikiSha256: '36d139b4fc92b712e6c29ac0533d08cea7193cecd8144fc0584f422178379ccd'
]
]
--
GitLab