Skip to content

XWiki 13.7 release#10824

Merged
yosifkit merged 2 commits intodocker-library:masterfrom
manuelleduc:patch-1
Sep 2, 2021
Merged

XWiki 13.7 release#10824
yosifkit merged 2 commits intodocker-library:masterfrom
manuelleduc:patch-1

Conversation

@manuelleduc
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

yosifkit commented Sep 1, 2021

Apologies, the tomcat:adoptopenjdk variants where dropped in #10817 (docker-library/tomcat#240) because of the rename/move of the adoptopenjdk project to "Eclipse Temurin" (#10662). So the xwiki images will need to swap to a different tomcat variant.

@github-actions
Copy link

github-actions bot commented Sep 2, 2021

Diff for 9b6feba:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2609e16..25b199f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -10,13 +10,13 @@ Architectures: amd64, arm64v8
 GitCommit: 584f33e831ba80616bb576f850c27c0ee117155f
 Directory: 12/postgres-tomcat
 
-Tags: 13, 13.6, 13.6.0, 13-mysql-tomcat, 13.6-mysql-tomcat, 13.6.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
-GitCommit: ab7772d340dd34d727b68b0266bf3cdfad992716
+Tags: 13, 13.7, 13.7.0, 13-mysql-tomcat, 13.7-mysql-tomcat, 13.7.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
+GitCommit: 1bc6747d90638e90134290d2b6c07c089ef5dc75
 Directory: 13/mysql-tomcat
 
-Tags: 13-postgres-tomcat, 13.6-postgres-tomcat, 13.6.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Tags: 13-postgres-tomcat, 13.7-postgres-tomcat, 13.7.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
 Architectures: amd64, arm64v8
-GitCommit: ab7772d340dd34d727b68b0266bf3cdfad992716
+GitCommit: 1bc6747d90638e90134290d2b6c07c089ef5dc75
 Directory: 13/postgres-tomcat
 
 Tags: 13.4, 13.4.3, 13.4-mysql-tomcat, 13.4.3-mysql-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index e6431dd..98135fc 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -16,12 +16,12 @@ xwiki:13.4-postgres-tomcat
 xwiki:13.4.3
 xwiki:13.4.3-mysql-tomcat
 xwiki:13.4.3-postgres-tomcat
-xwiki:13.6
-xwiki:13.6-mysql-tomcat
-xwiki:13.6-postgres-tomcat
-xwiki:13.6.0
-xwiki:13.6.0-mysql-tomcat
-xwiki:13.6.0-postgres-tomcat
+xwiki:13.7
+xwiki:13.7-mysql-tomcat
+xwiki:13.7-postgres-tomcat
+xwiki:13.7.0
+xwiki:13.7.0-mysql-tomcat
+xwiki:13.7.0-postgres-tomcat
 xwiki:latest
 xwiki:lts
 xwiki:lts-mysql
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index e0d82a6..32dfcfe 100644
--- a/xwiki_latest/Dockerfile
+++ b/xwiki_latest/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -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="13.6"
+ENV XWIKI_VERSION="13.7"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 58518900cd01cc8445e0fb098c33d721070180f26542fdce9ce38677c0b06dab
+ENV XWIKI_DOWNLOAD_SHA256 33ebdd127ba25e71d374a1e0e2a64a88dd3a32ad42e6ac878659d926dcccf2e3
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_stable-postgres/Dockerfile b/xwiki_stable-postgres/Dockerfile
index 5e7b0ab..0b79fc5 100644
--- a/xwiki_stable-postgres/Dockerfile
+++ b/xwiki_stable-postgres/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
@@ -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="13.6"
+ENV XWIKI_VERSION="13.7"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 58518900cd01cc8445e0fb098c33d721070180f26542fdce9ce38677c0b06dab
+ENV XWIKI_DOWNLOAD_SHA256 33ebdd127ba25e71d374a1e0e2a64a88dd3a32ad42e6ac878659d926dcccf2e3
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \

@yosifkit
Copy link
Member

yosifkit commented Sep 2, 2021

👍 Thanks for updating the 13.7 versions. I'll merge so we can get the new version building for users.

You'll likely want to update the rest soon since they'll no longer be rebuilt with updated base images (esp for things like the recent openssl fixes).

@yosifkit yosifkit merged commit ff0ef95 into docker-library:master Sep 2, 2021
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

Comments