From 09c408b0cb37dba527021a35504afacbc1d55d4a Mon Sep 17 00:00:00 2001
From: Marius Dumitru Florea <marius@xwiki.com>
Date: Wed, 5 Aug 2020 10:55:02 +0300
Subject: [PATCH] XDOCKER-149: Upgrade stable version to 12.6
---
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 4b6202c..8c0410f 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.5.1
+XWIKI_VERSION=12.6
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index bf0b148..288f21a 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.5.1"
+ENV XWIKI_VERSION="12.6"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 09d6bca7466cc70f7b78802209f391b2537757abfe14740fdb7d852470b22557
+ENV XWIKI_DOWNLOAD_SHA256 6ad47ade6e403cc67587496d9b7e7556f80fd21cc0049d941837dcdd094cd1cd
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 56fd30d..edc2cb5 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.5.1
+XWIKI_VERSION=12.6
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 6fb9af6..c51020a 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.5.1"
+ENV XWIKI_VERSION="12.6"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 09d6bca7466cc70f7b78802209f391b2537757abfe14740fdb7d852470b22557
+ENV XWIKI_DOWNLOAD_SHA256 6ad47ade6e403cc67587496d9b7e7556f80fd21cc0049d941837dcdd094cd1cd
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 e5c071c..6613499 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '926cdab925cbac1053a9c2d829fe5d714dba919dd85c7aac5876d878fa99f61f'
],
'12': [
- xwikiVersion: '12.5.1',
- xwikiSha256: '09d6bca7466cc70f7b78802209f391b2537757abfe14740fdb7d852470b22557'
+ xwikiVersion: '12.6',
+ xwikiSha256: '6ad47ade6e403cc67587496d9b7e7556f80fd21cc0049d941837dcdd094cd1cd'
]
]
--
GitLab