From 4ef81d6bcef7b1bf39ef4d063182ead530baa967 Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Thu, 26 Nov 2020 18:42:46 +0200
Subject: [PATCH] XDOCKER-168: Upgrade stable version to 12.10
---
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, 8 insertions(+), 8 deletions(-)
diff --git a/12/mysql-tomcat/.env b/12/mysql-tomcat/.env
index 7abd0b9..0422b77 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.9
+XWIKI_VERSION=12.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 6813ede..0e743b8 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.9"
+ENV XWIKI_VERSION="12.10"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 5e668f58ca01f10f031a16039fe08864a1f3abec3066aeb6adb2c3bfcedd8883
+ENV XWIKI_DOWNLOAD_SHA256 d86ad5b58697ef35a968165798de539615bc27f9f3cc7644528128e51e62b4c8
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 7eca908..f6bc9a3 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.9
+XWIKI_VERSION=12.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 642054a..585e74a 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.9"
+ENV XWIKI_VERSION="12.10"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 5e668f58ca01f10f031a16039fe08864a1f3abec3066aeb6adb2c3bfcedd8883
+ENV XWIKI_DOWNLOAD_SHA256 d86ad5b58697ef35a968165798de539615bc27f9f3cc7644528128e51e62b4c8
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 e2bb2a7..02cad3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '472d7bb0d1ff8a7c3a5addf69e5c7b844edaa631d6df8e7b86d42c6b32cd3368'
],
'12': [
- xwikiVersion: '12.9',
- xwikiSha256: '5e668f58ca01f10f031a16039fe08864a1f3abec3066aeb6adb2c3bfcedd8883'
+ xwikiVersion: '12.10',
+ xwikiSha256: 'd86ad5b58697ef35a968165798de539615bc27f9f3cc7644528128e51e62b4c8'
]
]
--
GitLab