Skip to content

Release XWiki 11.10.5#8019

Merged
yosifkit merged 1 commit intodocker-library:masterfrom
surli:patch-3
May 15, 2020
Merged

Release XWiki 11.10.5#8019
yosifkit merged 1 commit intodocker-library:masterfrom
surli:patch-3

Conversation

@surli
Copy link
Contributor

@surli surli commented May 15, 2020

No description provided.

@github-actions
Copy link

Diff for ea898a0:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 75a1c32..67e37c7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,13 +1,13 @@
 Maintainers: XWiki Core Dev Team <committers@xwiki.org> (@xwiki)
 GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
 
-Tags: 11, 11.10, 11.10.4, 11-mysql-tomcat, 11.10-mysql-tomcat, 11.10.4-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
-GitCommit: cab959829bd94668a5a6624aa370eb42e8a7c2b1
+Tags: 11, 11.10, 11.10.5, 11-mysql-tomcat, 11.10-mysql-tomcat, 11.10.5-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
+GitCommit: f6c69a5d6c525829713209cb2a0d8ce14b8a5038
 Directory: 11/mysql-tomcat
 
-Tags: 11-postgres-tomcat, 11.10-postgres-tomcat, 11.10.4-postgres-tomcat, lts-postgres-tomcat, lts-postgres
+Tags: 11-postgres-tomcat, 11.10-postgres-tomcat, 11.10.5-postgres-tomcat, lts-postgres-tomcat, lts-postgres
 Architectures: amd64, arm64v8
-GitCommit: cab959829bd94668a5a6624aa370eb42e8a7c2b1
+GitCommit: f6c69a5d6c525829713209cb2a0d8ce14b8a5038
 Directory: 11/postgres-tomcat
 
 Tags: 12, 12.3, 12-mysql-tomcat, 12.3-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index 629978f..51795d3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,9 +4,9 @@ xwiki:11-postgres-tomcat
 xwiki:11.10
 xwiki:11.10-mysql-tomcat
 xwiki:11.10-postgres-tomcat
-xwiki:11.10.4
-xwiki:11.10.4-mysql-tomcat
-xwiki:11.10.4-postgres-tomcat
+xwiki:11.10.5
+xwiki:11.10.5-mysql-tomcat
+xwiki:11.10.5-postgres-tomcat
 xwiki:12
 xwiki:12-mysql-tomcat
 xwiki:12-postgres-tomcat
diff --git a/xwiki_lts-postgres/Dockerfile b/xwiki_lts-postgres/Dockerfile
index 5100739..7161cdb 100644
--- a/xwiki_lts-postgres/Dockerfile
+++ b/xwiki_lts-postgres/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=11.10.4
+ENV XWIKI_VERSION=11.10.5
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 3cd14319c5161ab7cea5dab3c4d1b3f8b7f745c3a1d13d65583361755adb262a
+ENV XWIKI_DOWNLOAD_SHA256 b08c8a9f0abbbf2bef5c61852688165dd4b2a9a7217da29047647e81c1ec3058
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_lts/Dockerfile b/xwiki_lts/Dockerfile
index e6fcbfd..67c823a 100644
--- a/xwiki_lts/Dockerfile
+++ b/xwiki_lts/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=11.10.4
+ENV XWIKI_VERSION=11.10.5
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 3cd14319c5161ab7cea5dab3c4d1b3f8b7f745c3a1d13d65583361755adb262a
+ENV XWIKI_DOWNLOAD_SHA256 b08c8a9f0abbbf2bef5c61852688165dd4b2a9a7217da29047647e81c1ec3058
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \

@yosifkit
Copy link
Member

Merging, but builds will be delayed due to Debian and PHP security fixes that have filled the build queue.

@yosifkit yosifkit merged commit 4534872 into docker-library:master May 15, 2020
@surli surli deleted the patch-3 branch May 18, 2020 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants