From 626a6c837b637f59a9b728990646de516170ffe7 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Thu, 11 Feb 2021 10:25:26 +0200
Subject: [PATCH] XDOCKER-179: Upgrade stable version to 12.10.4
---
12/mysql-tomcat/.env | 2 +-
12/mysql-tomcat/Dockerfile | 4 ++--
12/postgres-tomcat/.env | 2 +-
12/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++++
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/12/mysql-tomcat/.env b/12/mysql-tomcat/.env
index 5506d4e..1127767 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.10.3
+XWIKI_VERSION=12.10.4
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 6d13535..471b623 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -43,9 +43,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="12.10.3"
+ENV XWIKI_VERSION="12.10.4"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 402d97322fa9234a844b03630324bbd9a2152ff320e3c27c8ec3fc12a082223f
+ENV XWIKI_DOWNLOAD_SHA256 fd213ff52d575cfec4c7f0c2c1e20312075d131fbc08285cc7d3b1234437eaa4
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/12/postgres-tomcat/.env b/12/postgres-tomcat/.env
index 522a61d..ee16050 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.10.3
+XWIKI_VERSION=12.10.4
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 91b81f1..0f92514 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/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="12.10.3"
+ENV XWIKI_VERSION="12.10.4"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 402d97322fa9234a844b03630324bbd9a2152ff320e3c27c8ec3fc12a082223f
+ENV XWIKI_DOWNLOAD_SHA256 fd213ff52d575cfec4c7f0c2c1e20312075d131fbc08285cc7d3b1234437eaa4
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 17fcc41..9eeab1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,10 @@ def tokens = [
'13': [
xwikiVersion: '13.0',
xwikiSha256: 'ae710ab7ec4447429b725cbbdbaa3fd6f6137ce4f3c4f7ba4da097b1a9047d09'
+ ],
+ '12': [
+ xwikiVersion: '12.10.4',
+ xwikiSha256: 'fd213ff52d575cfec4c7f0c2c1e20312075d131fbc08285cc7d3b1234437eaa4'
]
]
--
GitLab