Skip to content

Conversation

@vmassol
Copy link
Contributor

@vmassol vmassol commented Jul 11, 2022

@github-actions
Copy link

Diff for 7103399:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1ecf25b..dd8fb5d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,45 +3,45 @@ GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
 
 Tags: 13, 13.10, 13.10.7, 13-mysql-tomcat, 13.10-mysql-tomcat, 13.10.7-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
 Architectures: amd64, arm64v8
-GitCommit: 0772de41ef425a267b5710c7e2ae662d51227b4a
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 13/mysql-tomcat
 
 Tags: 13-mariadb-tomcat, 13.10-mariadb-tomcat, 13.10.7-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
 Architectures: amd64, arm64v8
-GitCommit: 0772de41ef425a267b5710c7e2ae662d51227b4a
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 13/mariadb-tomcat
 
 Tags: 13-postgres-tomcat, 13.10-postgres-tomcat, 13.10.7-postgres-tomcat, lts-postgres-tomcat, lts-postgres
 Architectures: amd64, arm64v8
-GitCommit: 0772de41ef425a267b5710c7e2ae662d51227b4a
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 13/postgres-tomcat
 
 Tags: 14, 14.5, 14.5.0, 14-mysql-tomcat, 14.5-mysql-tomcat, 14.5.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
 Architectures: amd64, arm64v8
-GitCommit: c57d0db0f59d249b55d64a2323b257bc305e713c
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 14/mysql-tomcat
 
 Tags: 14-mariadb-tomcat, 14.5-mariadb-tomcat, 14.5.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
 Architectures: amd64, arm64v8
-GitCommit: c57d0db0f59d249b55d64a2323b257bc305e713c
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 14/mariadb-tomcat
 
 Tags: 14-postgres-tomcat, 14.5-postgres-tomcat, 14.5.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
 Architectures: amd64, arm64v8
-GitCommit: c57d0db0f59d249b55d64a2323b257bc305e713c
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 14/postgres-tomcat
 
 Tags: 14.4, 14.4.2, 14.4-mysql-tomcat, 14.4.2-mysql-tomcat
 Architectures: amd64, arm64v8
-GitCommit: 5436842ff0aa1ba9af2570a75a1fb2fccce68e1f
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 14.4/mysql-tomcat
 
 Tags: 14.4-mariadb-tomcat, 14.4.2-mariadb-tomcat
 Architectures: amd64, arm64v8
-GitCommit: 5436842ff0aa1ba9af2570a75a1fb2fccce68e1f
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 14.4/mariadb-tomcat
 
 Tags: 14.4-postgres-tomcat, 14.4.2-postgres-tomcat
 Architectures: amd64, arm64v8
-GitCommit: 5436842ff0aa1ba9af2570a75a1fb2fccce68e1f
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 Directory: 14.4/postgres-tomcat
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index 12ee7d3..948252c 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:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_lts-mariadb/Dockerfile b/xwiki_lts-mariadb/Dockerfile
index ab97fc8..3d0d28f 100644
--- a/xwiki_lts-mariadb/Dockerfile
+++ b/xwiki_lts-mariadb/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:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_lts-postgres/Dockerfile b/xwiki_lts-postgres/Dockerfile
index 1f6960c..a69f5dd 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:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_lts/Dockerfile b/xwiki_lts/Dockerfile
index 1dbab21..062e022 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:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_stable-mariadb/Dockerfile b/xwiki_stable-mariadb/Dockerfile
index 1e9b365..8819d7e 100644
--- a/xwiki_stable-mariadb/Dockerfile
+++ b/xwiki_stable-mariadb/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:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/xwiki_stable-postgres/Dockerfile b/xwiki_stable-postgres/Dockerfile
index 1bef796..4e23cb6 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:9-jre11
+FROM tomcat:9-jre11-openjdk
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)

Relevant Maintainers:

@tianon
Copy link
Member

tianon commented Jul 11, 2022

Doh -- looks like docker-library/tomcat#265 made xwiki not show up in the list for my ping on docker-library/docs#2162.

The TLDR there is that this is OK for now, but it will not work for long (because those tomcat:*-openjdk variants are going to go away completely very soon). 🙈

@tianon tianon merged commit 7d17a0c into docker-library:master Jul 11, 2022
@yosifkit
Copy link
Member

tomcat:*-temurin-focal variants might be an alternative once the debian-based images are gone and still fix the issue that users were hitting.

@vmassol
Copy link
Contributor Author

vmassol commented Jul 12, 2022

Thanks @yosifkit , very useful information, as always! I'll discuss this with the team and users.

@tianon tianon mentioned this pull request Jul 25, 2022
@tianon tianon mentioned this pull request Aug 29, 2022
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.

3 participants