Browse Source

Merge pull request #12767 from vmassol/patch-41

Force usage of openjdk since the automatic switch to eclipse-temurin makes XWiki image unusable for some users
Tianon Gravi 3 years ago
parent
commit
7d17a0c9f0
1 changed files with 9 additions and 9 deletions
  1. 9 9
      library/xwiki

+ 9 - 9
library/xwiki

@@ -4,45 +4,45 @@ GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
 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
 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
 Architectures: amd64, arm64v8
 Directory: 14/mysql-tomcat
 Directory: 14/mysql-tomcat
-GitCommit: c57d0db0f59d249b55d64a2323b257bc305e713c
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 Tags: 14-postgres-tomcat, 14.5-postgres-tomcat, 14.5.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
 Tags: 14-postgres-tomcat, 14.5-postgres-tomcat, 14.5.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
 Architectures: amd64, arm64v8
 Architectures: amd64, arm64v8
 Directory: 14/postgres-tomcat
 Directory: 14/postgres-tomcat
-GitCommit: c57d0db0f59d249b55d64a2323b257bc305e713c
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 Tags: 14-mariadb-tomcat, 14.5-mariadb-tomcat, 14.5.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
 Tags: 14-mariadb-tomcat, 14.5-mariadb-tomcat, 14.5.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
 Architectures: amd64, arm64v8
 Architectures: amd64, arm64v8
 Directory: 14/mariadb-tomcat
 Directory: 14/mariadb-tomcat
-GitCommit: c57d0db0f59d249b55d64a2323b257bc305e713c
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 # Mid-year "LTS" (done by XWiki SAS developers and not official). To be removed when the next official LTS is released.
 # Mid-year "LTS" (done by XWiki SAS developers and not official). To be removed when the next official LTS is released.
 Tags: 14.4, 14.4.2, 14.4-mysql-tomcat, 14.4.2-mysql-tomcat
 Tags: 14.4, 14.4.2, 14.4-mysql-tomcat, 14.4.2-mysql-tomcat
 Architectures: amd64, arm64v8
 Architectures: amd64, arm64v8
 Directory: 14.4/mysql-tomcat
 Directory: 14.4/mysql-tomcat
-GitCommit: 5436842ff0aa1ba9af2570a75a1fb2fccce68e1f
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 Tags: 14.4-postgres-tomcat, 14.4.2-postgres-tomcat
 Tags: 14.4-postgres-tomcat, 14.4.2-postgres-tomcat
 Architectures: amd64, arm64v8
 Architectures: amd64, arm64v8
 Directory: 14.4/postgres-tomcat
 Directory: 14.4/postgres-tomcat
-GitCommit: 5436842ff0aa1ba9af2570a75a1fb2fccce68e1f
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 Tags: 14.4-mariadb-tomcat, 14.4.2-mariadb-tomcat
 Tags: 14.4-mariadb-tomcat, 14.4.2-mariadb-tomcat
 Architectures: amd64, arm64v8
 Architectures: amd64, arm64v8
 Directory:  14.4/mariadb-tomcat
 Directory:  14.4/mariadb-tomcat
-GitCommit: 5436842ff0aa1ba9af2570a75a1fb2fccce68e1f
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 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
 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
 Architectures: amd64, arm64v8
 Directory: 13/mysql-tomcat
 Directory: 13/mysql-tomcat
-GitCommit: 0772de41ef425a267b5710c7e2ae662d51227b4a
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 Tags: 13-postgres-tomcat, 13.10-postgres-tomcat, 13.10.7-postgres-tomcat, lts-postgres-tomcat, lts-postgres
 Tags: 13-postgres-tomcat, 13.10-postgres-tomcat, 13.10.7-postgres-tomcat, lts-postgres-tomcat, lts-postgres
 Architectures: amd64, arm64v8
 Architectures: amd64, arm64v8
 Directory: 13/postgres-tomcat
 Directory: 13/postgres-tomcat
-GitCommit: 0772de41ef425a267b5710c7e2ae662d51227b4a
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
 
 
 Tags: 13-mariadb-tomcat, 13.10-mariadb-tomcat, 13.10.7-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
 Tags: 13-mariadb-tomcat, 13.10-mariadb-tomcat, 13.10.7-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
 Architectures: amd64, arm64v8
 Architectures: amd64, arm64v8
 Directory: 13/mariadb-tomcat
 Directory: 13/mariadb-tomcat
-GitCommit: 0772de41ef425a267b5710c7e2ae662d51227b4a
+GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790