From d5f8f3ea20680b4ba56edbaa8c10b0ac09811010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Cotiug=C4=83?= <alexandru.cotiuga@xwiki.com>
Date: Thu, 29 Nov 2018 10:05:49 +0200
Subject: [PATCH] XDOCKER-88: Upgrade stable version to 10.10
---
10/mysql-tomcat/.env | 2 +-
10/mysql-tomcat/Dockerfile | 4 ++--
10/postgres-tomcat/.env | 2 +-
10/postgres-tomcat/Dockerfile | 4 ++--
build.gradle | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/10/mysql-tomcat/.env b/10/mysql-tomcat/.env
index e3a3681..aaabf52 100644
--- a/10/mysql-tomcat/.env
+++ b/10/mysql-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.9
+XWIKI_VERSION=10.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index 638190a..899f45f 100644
--- a/10/mysql-tomcat/Dockerfile
+++ b/10/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=10.9
+ENV XWIKI_VERSION=10.10
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 100b60e4caf94bb653c50a8991d3deab9131c5631f0848e27637aa006c412aa7
+ENV XWIKI_DOWNLOAD_SHA256 33b4736b44b547d4fc95e337c075481fcd74b86288686bcea81e167f85de7f42
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/10/postgres-tomcat/.env b/10/postgres-tomcat/.env
index 63a0d83..e49d998 100644
--- a/10/postgres-tomcat/.env
+++ b/10/postgres-tomcat/.env
@@ -1,5 +1,5 @@
# Default environment values
-XWIKI_VERSION=10.9
+XWIKI_VERSION=10.10
DB_USER=xwiki
DB_PASSWORD=xwiki
DB_DATABASE=xwiki
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 37461bd..bd9fe9c 100644
--- a/10/postgres-tomcat/Dockerfile
+++ b/10/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=10.9
+ENV XWIKI_VERSION=10.10
ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 100b60e4caf94bb653c50a8991d3deab9131c5631f0848e27637aa006c412aa7
+ENV XWIKI_DOWNLOAD_SHA256 33b4736b44b547d4fc95e337c075481fcd74b86288686bcea81e167f85de7f42
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 73c759a..2f8dd6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ def tokens = [
xwikiSha256: 'e7b6f563012349dad2051fa7bb2ba5a5c2e736d11fcc41363a6acde16a4c128c'
],
'10': [
- xwikiVersion: '10.9',
- xwikiSha256: '100b60e4caf94bb653c50a8991d3deab9131c5631f0848e27637aa006c412aa7'
+ xwikiVersion: '10.10',
+ xwikiSha256: '33b4736b44b547d4fc95e337c075481fcd74b86288686bcea81e167f85de7f42'
]
]
--
GitLab