From aa5833b1b1f8c43c75f27a3f1de846818c2df4da Mon Sep 17 00:00:00 2001
From: Eduard Moraru <Enygma2002@gmail.com>
Date: Fri, 14 Aug 2020 21:56:14 +0300
Subject: [PATCH] XDOCKER-150: Upgrade stable version to 12.6.1
---
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 8c0410f..0983608 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.6
+XWIKI_VERSION=12.6.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 288f21a..922a681 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.6"
+ENV XWIKI_VERSION="12.6.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 6ad47ade6e403cc67587496d9b7e7556f80fd21cc0049d941837dcdd094cd1cd
+ENV XWIKI_DOWNLOAD_SHA256 51af0ba1131cf145eff251eb52e32a622dd61d076bda180f333579f8c55f43e2
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 edc2cb5..d58bf32 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.6
+XWIKI_VERSION=12.6.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index c51020a..3471aec 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.6"
+ENV XWIKI_VERSION="12.6.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 6ad47ade6e403cc67587496d9b7e7556f80fd21cc0049d941837dcdd094cd1cd
+ENV XWIKI_DOWNLOAD_SHA256 51af0ba1131cf145eff251eb52e32a622dd61d076bda180f333579f8c55f43e2
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 6613499..8b93f09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: '926cdab925cbac1053a9c2d829fe5d714dba919dd85c7aac5876d878fa99f61f'
],
'12': [
- xwikiVersion: '12.6',
- xwikiSha256: '6ad47ade6e403cc67587496d9b7e7556f80fd21cc0049d941837dcdd094cd1cd'
+ xwikiVersion: '12.6.1',
+ xwikiSha256: '51af0ba1131cf145eff251eb52e32a622dd61d076bda180f333579f8c55f43e2'
]
]
--
GitLab