From 1c0f65c352ade5100683f1877d86ff53ef48ef5b Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Thu, 12 Dec 2019 12:58:10 +0200
Subject: [PATCH] XDOCKER-124: Upgrade stable version to 11.10.1
---
10/mysql-tomcat/xwiki/docker-entrypoint.sh | 2 +-
10/postgres-tomcat/xwiki/docker-entrypoint.sh | 2 +-
11/mysql-tomcat/.env | 2 +-
11/mysql-tomcat/Dockerfile | 4 ++--
11/mysql-tomcat/xwiki/docker-entrypoint.sh | 2 +-
11/postgres-tomcat/.env | 2 +-
11/postgres-tomcat/Dockerfile | 4 ++--
11/postgres-tomcat/xwiki/docker-entrypoint.sh | 2 +-
build.gradle | 4 ++--
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/10/mysql-tomcat/xwiki/docker-entrypoint.sh b/10/mysql-tomcat/xwiki/docker-entrypoint.sh
index 005b083..8f8685a 100755
--- a/10/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/10/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -115,7 +115,7 @@ function configure() {
file_env 'INDEX_HOST' 'localhost'
file_env 'INDEX_PORT' '8983'
- echo " Deploying XWiki in the $CONTEXT_PATH context"
+ echo " Deploying XWiki in the '$CONTEXT_PATH' context"
if [ "$CONTEXT_PATH" == "ROOT" ]; then
xwiki_set_cfg 'xwiki.webapppath' ''
else
diff --git a/10/postgres-tomcat/xwiki/docker-entrypoint.sh b/10/postgres-tomcat/xwiki/docker-entrypoint.sh
index 005b083..8f8685a 100755
--- a/10/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/10/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -115,7 +115,7 @@ function configure() {
file_env 'INDEX_HOST' 'localhost'
file_env 'INDEX_PORT' '8983'
- echo " Deploying XWiki in the $CONTEXT_PATH context"
+ echo " Deploying XWiki in the '$CONTEXT_PATH' context"
if [ "$CONTEXT_PATH" == "ROOT" ]; then
xwiki_set_cfg 'xwiki.webapppath' ''
else
diff --git a/11/mysql-tomcat/.env b/11/mysql-tomcat/.env
index 286b4ed..8ae859e 100644
--- a/11/mysql-tomcat/.env
+++ b/11/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=11.10
+XWIKI_VERSION=11.10.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index df22595..716f293 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/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=11.10
+ENV XWIKI_VERSION=11.10.1
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e
+ENV XWIKI_DOWNLOAD_SHA256 531c105af1848274185f3472a2d0f1c6de9c046ea64d0efba4f657545fc247be
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/11/mysql-tomcat/xwiki/docker-entrypoint.sh b/11/mysql-tomcat/xwiki/docker-entrypoint.sh
index 005b083..8f8685a 100755
--- a/11/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/11/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -115,7 +115,7 @@ function configure() {
file_env 'INDEX_HOST' 'localhost'
file_env 'INDEX_PORT' '8983'
- echo " Deploying XWiki in the $CONTEXT_PATH context"
+ echo " Deploying XWiki in the '$CONTEXT_PATH' context"
if [ "$CONTEXT_PATH" == "ROOT" ]; then
xwiki_set_cfg 'xwiki.webapppath' ''
else
diff --git a/11/postgres-tomcat/.env b/11/postgres-tomcat/.env
index 178f995..94496d5 100644
--- a/11/postgres-tomcat/.env
+++ b/11/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=11.10
+XWIKI_VERSION=11.10.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile
index 5486078..fca613b 100644
--- a/11/postgres-tomcat/Dockerfile
+++ b/11/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=11.10
+ENV XWIKI_VERSION=11.10.1
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e
+ENV XWIKI_DOWNLOAD_SHA256 531c105af1848274185f3472a2d0f1c6de9c046ea64d0efba4f657545fc247be
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/11/postgres-tomcat/xwiki/docker-entrypoint.sh b/11/postgres-tomcat/xwiki/docker-entrypoint.sh
index 005b083..8f8685a 100755
--- a/11/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/11/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -115,7 +115,7 @@ function configure() {
file_env 'INDEX_HOST' 'localhost'
file_env 'INDEX_PORT' '8983'
- echo " Deploying XWiki in the $CONTEXT_PATH context"
+ echo " Deploying XWiki in the '$CONTEXT_PATH' context"
if [ "$CONTEXT_PATH" == "ROOT" ]; then
xwiki_set_cfg 'xwiki.webapppath' ''
else
diff --git a/build.gradle b/build.gradle
index d7abf27..914a490 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'e1feedd24f0a27ba4e36464913a2fcb43a60f9310283a8a6be017a1979618bb7'
],
'11': [
- xwikiVersion: '11.10',
- xwikiSha256: '793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e'
+ xwikiVersion: '11.10.1',
+ xwikiSha256: '531c105af1848274185f3472a2d0f1c6de9c046ea64d0efba4f657545fc247be'
]
]
--
GitLab