Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XWiki: Upgrade stable version to 16.0.0 #16148

Merged
merged 1 commit into from
Jan 29, 2024

Conversation

oanalavinia
Copy link
Contributor

No description provided.

Copy link

Diff for f846267:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 555f825..6696948 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,17 +16,17 @@ Architectures: amd64, arm64v8
 GitCommit: c0c657c87f969d33cec32d9884b64a93f9352b50
 Directory: 14/postgres-tomcat
 
-Tags: 15, 15.10, 15.10.5, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.5-mysql-tomcat, mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts, stable-mysql-tomcat, stable-mysql, stable, latest
+Tags: 15, 15.10, 15.10.5, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.5-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
 Architectures: amd64, arm64v8
 GitCommit: 052b6e3674b879cd400e7b1fd4dcbc2f65f6b878
 Directory: 15/mysql-tomcat
 
-Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.5-mariadb-tomcat, mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb, stable-mariadb-tomcat, stable-mariadb
+Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.5-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
 Architectures: amd64, arm64v8
 GitCommit: 052b6e3674b879cd400e7b1fd4dcbc2f65f6b878
 Directory: 15/mariadb-tomcat
 
-Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.5-postgres-tomcat, postgres-tomcat, lts-postgres-tomcat, lts-postgres, stable-postgres-tomcat, stable-postgres
+Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.5-postgres-tomcat, lts-postgres-tomcat, lts-postgres
 Architectures: amd64, arm64v8
 GitCommit: 052b6e3674b879cd400e7b1fd4dcbc2f65f6b878
 Directory: 15/postgres-tomcat
@@ -45,3 +45,18 @@ Tags: 15.5-postgres-tomcat, 15.5.4-postgres-tomcat
 Architectures: amd64, arm64v8
 GitCommit: 75fbc887160154a51b62ed5c1053d0a210fc8c22
 Directory: 15.5/postgres-tomcat
+
+Tags: 16, 16.0, 16.0.0, 16-mysql-tomcat, 16.0-mysql-tomcat, 16.0.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
+Architectures: amd64, arm64v8
+GitCommit: cfd12b26da4688edebf4f3b3fe7b26781306bbee
+Directory: 16/mysql-tomcat
+
+Tags: 16-mariadb-tomcat, 16.0-mariadb-tomcat, 16.0.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
+Architectures: amd64, arm64v8
+GitCommit: cfd12b26da4688edebf4f3b3fe7b26781306bbee
+Directory: 16/mariadb-tomcat
+
+Tags: 16-postgres-tomcat, 16.0-postgres-tomcat, 16.0.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Architectures: amd64, arm64v8
+GitCommit: cfd12b26da4688edebf4f3b3fe7b26781306bbee
+Directory: 16/postgres-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 569c61f..af1c682 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -30,6 +30,18 @@ xwiki:15.10.5
 xwiki:15.10.5-mariadb-tomcat
 xwiki:15.10.5-mysql-tomcat
 xwiki:15.10.5-postgres-tomcat
+xwiki:16
+xwiki:16-mariadb-tomcat
+xwiki:16-mysql-tomcat
+xwiki:16-postgres-tomcat
+xwiki:16.0
+xwiki:16.0-mariadb-tomcat
+xwiki:16.0-mysql-tomcat
+xwiki:16.0-postgres-tomcat
+xwiki:16.0.0
+xwiki:16.0.0-mariadb-tomcat
+xwiki:16.0.0-mysql-tomcat
+xwiki:16.0.0-postgres-tomcat
 xwiki:latest
 xwiki:lts
 xwiki:lts-mariadb
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index 14f8f67..7145c7f 100644
--- a/xwiki_latest/Dockerfile
+++ b/xwiki_latest/Dockerfile
@@ -48,9 +48,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="15.10.5"
+ENV XWIKI_VERSION="16.0.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 3775334377ae7fb8bcf6a21e6eb099a8cfbea43044dc0716c01cb3b5117988a2
+ENV XWIKI_DOWNLOAD_SHA256 955c175d0ac0e7039eeafd8569d87ad8a7967092ad8d018decb80a42a7eb941f
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_stable-mariadb/Dockerfile b/xwiki_lts-mariadb/Dockerfile
similarity index 100%
copy from xwiki_stable-mariadb/Dockerfile
copy to xwiki_lts-mariadb/Dockerfile
diff --git a/xwiki_14.10.20-mariadb-tomcat/tomcat/setenv.sh b/xwiki_lts-mariadb/tomcat/setenv.sh
similarity index 100%
copy from xwiki_14.10.20-mariadb-tomcat/tomcat/setenv.sh
copy to xwiki_lts-mariadb/tomcat/setenv.sh
diff --git a/xwiki_14.10.20-mariadb-tomcat/xwiki/docker-entrypoint.sh b/xwiki_lts-mariadb/xwiki/docker-entrypoint.sh
similarity index 100%
copy from xwiki_14.10.20-mariadb-tomcat/xwiki/docker-entrypoint.sh
copy to xwiki_lts-mariadb/xwiki/docker-entrypoint.sh
diff --git a/xwiki_14.10.20-mariadb-tomcat/xwiki/hibernate.cfg.xml b/xwiki_lts-mariadb/xwiki/hibernate.cfg.xml
similarity index 100%
copy from xwiki_14.10.20-mariadb-tomcat/xwiki/hibernate.cfg.xml
copy to xwiki_lts-mariadb/xwiki/hibernate.cfg.xml
diff --git a/xwiki_stable-postgres/Dockerfile b/xwiki_lts-postgres/Dockerfile
similarity index 100%
copy from xwiki_stable-postgres/Dockerfile
copy to xwiki_lts-postgres/Dockerfile
diff --git a/xwiki_14.10.20-mariadb-tomcat/tomcat/setenv.sh b/xwiki_lts-postgres/tomcat/setenv.sh
similarity index 100%
copy from xwiki_14.10.20-mariadb-tomcat/tomcat/setenv.sh
copy to xwiki_lts-postgres/tomcat/setenv.sh
diff --git a/xwiki_14.10.20-postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_lts-postgres/xwiki/docker-entrypoint.sh
similarity index 100%
copy from xwiki_14.10.20-postgres-tomcat/xwiki/docker-entrypoint.sh
copy to xwiki_lts-postgres/xwiki/docker-entrypoint.sh
diff --git a/xwiki_14.10.20-postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_lts-postgres/xwiki/hibernate.cfg.xml
similarity index 100%
copy from xwiki_14.10.20-postgres-tomcat/xwiki/hibernate.cfg.xml
copy to xwiki_lts-postgres/xwiki/hibernate.cfg.xml
diff --git a/xwiki_latest/Dockerfile b/xwiki_lts/Dockerfile
similarity index 100%
copy from xwiki_latest/Dockerfile
copy to xwiki_lts/Dockerfile
diff --git a/xwiki_14.10.20-mariadb-tomcat/tomcat/setenv.sh b/xwiki_lts/tomcat/setenv.sh
similarity index 100%
copy from xwiki_14.10.20-mariadb-tomcat/tomcat/setenv.sh
copy to xwiki_lts/tomcat/setenv.sh
diff --git a/xwiki_14.10.20-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_lts/xwiki/docker-entrypoint.sh
similarity index 100%
copy from xwiki_14.10.20-mysql-tomcat/xwiki/docker-entrypoint.sh
copy to xwiki_lts/xwiki/docker-entrypoint.sh
diff --git a/xwiki_14.10.20-mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_lts/xwiki/hibernate.cfg.xml
similarity index 100%
copy from xwiki_14.10.20-mysql-tomcat/xwiki/hibernate.cfg.xml
copy to xwiki_lts/xwiki/hibernate.cfg.xml
diff --git a/xwiki_stable-mariadb/Dockerfile b/xwiki_stable-mariadb/Dockerfile
index 90bce61..bdf4116 100644
--- a/xwiki_stable-mariadb/Dockerfile
+++ b/xwiki_stable-mariadb/Dockerfile
@@ -48,9 +48,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="15.10.5"
+ENV XWIKI_VERSION="16.0.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 3775334377ae7fb8bcf6a21e6eb099a8cfbea43044dc0716c01cb3b5117988a2
+ENV XWIKI_DOWNLOAD_SHA256 955c175d0ac0e7039eeafd8569d87ad8a7967092ad8d018decb80a42a7eb941f
 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 f6cb6d6..f320501 100644
--- a/xwiki_stable-postgres/Dockerfile
+++ b/xwiki_stable-postgres/Dockerfile
@@ -49,9 +49,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="15.10.5"
+ENV XWIKI_VERSION="16.0.0"
 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 3775334377ae7fb8bcf6a21e6eb099a8cfbea43044dc0716c01cb3b5117988a2
+ENV XWIKI_DOWNLOAD_SHA256 955c175d0ac0e7039eeafd8569d87ad8a7967092ad8d018decb80a42a7eb941f
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \

Relevant Maintainers:

@LaurentGoderre LaurentGoderre changed the title Upgrade stable version to 16.0.0 XWiki: Upgrade stable version to 16.0.0 Jan 29, 2024
@yosifkit yosifkit merged commit c08641b into docker-library:master Jan 29, 2024
17 checks passed
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