From fba6a253e6190be6d01723c44fdb827d7b74dc8b Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 26 May 2020 18:01:40 +0200
Subject: [PATCH] XDOCKER-140: Upgrade stable version to 12.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, 8 insertions(+), 8 deletions(-)
diff --git a/12/mysql-tomcat/.env b/12/mysql-tomcat/.env
index 5f2552a..346ab07 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.3
+XWIKI_VERSION=12.4
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 670f7af..c8c7b4b 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/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=12.3
+ENV XWIKI_VERSION=12.4
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 300d1daef9daa0bab238a4c7802cb65dd904b1ec93dea4cd240e9c835f66aa1c
+ENV XWIKI_DOWNLOAD_SHA256 f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc
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 49617ac..7a37b2f 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.3
+XWIKI_VERSION=12.4
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index f8ddbf7..428d41d 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.3
+ENV XWIKI_VERSION=12.4
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 300d1daef9daa0bab238a4c7802cb65dd904b1ec93dea4cd240e9c835f66aa1c
+ENV XWIKI_DOWNLOAD_SHA256 f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc
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 d7c03cf..44d89bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'b08c8a9f0abbbf2bef5c61852688165dd4b2a9a7217da29047647e81c1ec3058'
],
'12': [
- xwikiVersion: '12.3',
- xwikiSha256: '300d1daef9daa0bab238a4c7802cb65dd904b1ec93dea4cd240e9c835f66aa1c'
+ xwikiVersion: '12.4',
+ xwikiSha256: 'f42fe7b84a323b0f637c0e9c60e885741821b2fd05f0196d4d41729d5888d2cc'
]
]
--
GitLab