Skip to content

Update stable version to 13.8#10972

Merged
yosifkit merged 2 commits intodocker-library:masterfrom
surli:patch-5
Sep 29, 2021
Merged

Update stable version to 13.8#10972
yosifkit merged 2 commits intodocker-library:masterfrom
surli:patch-5

Conversation

@surli
Copy link
Contributor

@surli surli commented Sep 27, 2021

No description provided.

@surli
Copy link
Contributor Author

surli commented Sep 28, 2021

@yosifkit Hi, I'm not sure to understand why the check is failing. Apparently it's related to tomcat:8-jdk11-adoptopenjdk-hotspot except that since #10824 we don't reference this image anymore. Sounds like the check is seeing it in other versions of XWiki images we already deployed?

@yosifkit
Copy link
Member

The test checks everything still listed in the library file, since that is the "supported" versions.

All official images are rebuilt when either their build context changes (e.g. library file updated for newer Dockerfile) or their base image is updated (e.g. debian -> python:3). We strive to publish updated images at least monthly for Debian and Ubuntu so that all dependent images get updates for OS packages (i.e. security and bugfix updates). See also our FAQ entry on CVE's.

To ensure that all supported images get updates when base images are updated, they need to be FROM a current image. Since xwiki:12, xwiki:13.4, and their postgres variants are FROM an image that is no longer being maintained, they will no longer be rebuilt for OS security updates. Since users expect the images to be updated in a timely fashion, if those older releases are no longer going to be updated (for either an xwiki bump or an OS change so they can keep receiving rebuild updates), then they should likely be removed from the library/xwiki file.

@yosifkit
Copy link
Member

Removing it here will remove it from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding it on the official build server), but the tag will still be available to users who want it. (See https://github.com/docker-library/official-images#library-definition-files for more detail on this.)

@github-actions
Copy link

Diff for 05379e4:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 25b199f..a5b9ef6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,30 +2,30 @@ Maintainers: XWiki Core Dev Team <committers@xwiki.org> (@xwiki)
 GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
 
 Tags: 12, 12.10, 12.10.9, 12-mysql-tomcat, 12.10-mysql-tomcat, 12.10.9-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
-GitCommit: 584f33e831ba80616bb576f850c27c0ee117155f
+GitCommit: 1bc6747d90638e90134290d2b6c07c089ef5dc75
 Directory: 12/mysql-tomcat
 
 Tags: 12-postgres-tomcat, 12.10-postgres-tomcat, 12.10.9-postgres-tomcat, lts-postgres-tomcat, lts-postgres
 Architectures: amd64, arm64v8
-GitCommit: 584f33e831ba80616bb576f850c27c0ee117155f
+GitCommit: 1bc6747d90638e90134290d2b6c07c089ef5dc75
 Directory: 12/postgres-tomcat
 
-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
+Tags: 13, 13.8, 13.8.0, 13-mysql-tomcat, 13.8-mysql-tomcat, 13.8.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
+GitCommit: 3bf60d5eeb146822cff176dc4d881cbbf4659533
 Directory: 13/mysql-tomcat
 
-Tags: 13-postgres-tomcat, 13.7-postgres-tomcat, 13.7.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Tags: 13-postgres-tomcat, 13.8-postgres-tomcat, 13.8.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
 Architectures: amd64, arm64v8
-GitCommit: 1bc6747d90638e90134290d2b6c07c089ef5dc75
+GitCommit: 3bf60d5eeb146822cff176dc4d881cbbf4659533
 Directory: 13/postgres-tomcat
 
 Tags: 13.4, 13.4.3, 13.4-mysql-tomcat, 13.4.3-mysql-tomcat
 GitFetch: refs/heads/stable-13.4.x
-GitCommit: 65238716e755e80096f2a81ff3dc233ac5b03369
+GitCommit: 49e5bcda5ab65e3db5100f046605e65e2efcfd56
 Directory: 13/mysql-tomcat
 
 Tags: 13.4-postgres-tomcat, 13.4.3-postgres-tomcat
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/stable-13.4.x
-GitCommit: 65238716e755e80096f2a81ff3dc233ac5b03369
+GitCommit: 49e5bcda5ab65e3db5100f046605e65e2efcfd56
 Directory: 13/postgres-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 98135fc..ae0b095 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.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:13.8
+xwiki:13.8-mysql-tomcat
+xwiki:13.8-postgres-tomcat
+xwiki:13.8.0
+xwiki:13.8.0-mysql-tomcat
+xwiki:13.8.0-postgres-tomcat
 xwiki:latest
 xwiki:lts
 xwiki:lts-mysql
diff --git a/xwiki_13.4.3-mysql-tomcat/Dockerfile b/xwiki_13.4.3-mysql-tomcat/Dockerfile
index f156f1e..a11ce97 100644
--- a/xwiki_13.4.3-mysql-tomcat/Dockerfile
+++ b/xwiki_13.4.3-mysql-tomcat/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
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_13.4.3-postgres-tomcat/Dockerfile b/xwiki_13.4.3-postgres-tomcat/Dockerfile
index d57003f..67328a3 100644
--- a/xwiki_13.4.3-postgres-tomcat/Dockerfile
+++ b/xwiki_13.4.3-postgres-tomcat/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
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index 32dfcfe..d55f929 100644
--- a/xwiki_latest/Dockerfile
+++ b/xwiki_latest/Dockerfile
@@ -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.7"
+ENV XWIKI_VERSION="13.8"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 33ebdd127ba25e71d374a1e0e2a64a88dd3a32ad42e6ac878659d926dcccf2e3
+ENV XWIKI_DOWNLOAD_SHA256 893acafbe88ad863fffa8f29a33984366bba532e18cf421946320775e95ff12f
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_lts-postgres/Dockerfile b/xwiki_lts-postgres/Dockerfile
index c9f6f00..e6de267 100644
--- a/xwiki_lts-postgres/Dockerfile
+++ b/xwiki_lts-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
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_lts/Dockerfile b/xwiki_lts/Dockerfile
index fbbf0b9..930896c 100644
--- a/xwiki_lts/Dockerfile
+++ b/xwiki_lts/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
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_stable-postgres/Dockerfile b/xwiki_stable-postgres/Dockerfile
index 0b79fc5..45f8b37 100644
--- a/xwiki_stable-postgres/Dockerfile
+++ b/xwiki_stable-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="13.7"
+ENV XWIKI_VERSION="13.8"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 33ebdd127ba25e71d374a1e0e2a64a88dd3a32ad42e6ac878659d926dcccf2e3
+ENV XWIKI_DOWNLOAD_SHA256 893acafbe88ad863fffa8f29a33984366bba532e18cf421946320775e95ff12f
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \

@surli
Copy link
Contributor Author

surli commented Sep 29, 2021

since #10824 we don't reference this image anymore

So apparently I was wrong on that: @manuelleduc fixed the xwiki docker files to use temurin in 13.7 and 12.10.x but apparently he forgot to put the new commit hash for 12.10.x and forgot to fix it for 13.4.x. In theory, all images should now rely on temurin.

@yosifkit yosifkit merged commit 1fe3862 into docker-library:master Sep 29, 2021
@surli surli deleted the patch-5 branch September 30, 2021 07:36
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