From 8d700c23be118b0ff8eb49bf7b82862014bd52dc Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Mon, 24 Feb 2020 21:04:17 +0100
Subject: [PATCH] XDOCKER-130: Upgrade stable version to 12.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 5c2df14..4faa0b5 100644
--- a/12/mysql-tomcat/.env
+++ b/12/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.0
+XWIKI_VERSION=12.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 34e4408..30c821d 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.0
+ENV XWIKI_VERSION=12.1
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 da57110002c76001dc9ca16eb217ea0d6c81a2b4bd3d8ad26a6fc5efe96c776d
+ENV XWIKI_DOWNLOAD_SHA256 1cec854acc88ec27cb39bdb0ef376a68d2aab03944d951f64776c0462ff5bb40
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 5d172cf..1fc1aab 100644
--- a/12/postgres-tomcat/.env
+++ b/12/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=12.0
+XWIKI_VERSION=12.1
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index a87a1bd..cf54175 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.0
+ENV XWIKI_VERSION=12.1
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 da57110002c76001dc9ca16eb217ea0d6c81a2b4bd3d8ad26a6fc5efe96c776d
+ENV XWIKI_DOWNLOAD_SHA256 1cec854acc88ec27cb39bdb0ef376a68d2aab03944d951f64776c0462ff5bb40
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 04c4f2d..f09545c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'fc959c8641d772d90a53bc1976e86fab907d290364cd802b7b3e0304dcbf008b'
],
'12': [
- xwikiVersion: '12.0',
- xwikiSha256: 'da57110002c76001dc9ca16eb217ea0d6c81a2b4bd3d8ad26a6fc5efe96c776d'
+ xwikiVersion: '12.1',
+ xwikiSha256: '1cec854acc88ec27cb39bdb0ef376a68d2aab03944d951f64776c0462ff5bb40'
]
]
--
GitLab