Release of XWiki 14.6 #12845
Merged
Release of XWiki 14.6 #12845
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Note that this also contains changes for base image of tomcat in all versions and mariaDB connector version for all images.
Diff for 51bcf51:diff --git a/_bashbrew-cat b/_bashbrew-cat
index dd8fb5d..cc42e8e 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: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
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: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
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: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
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
+Tags: 14, 14.6, 14.6.0, 14-mysql-tomcat, 14.6-mysql-tomcat, 14.6.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
Architectures: amd64, arm64v8
-GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
Directory: 14/mysql-tomcat
-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.6-mariadb-tomcat, 14.6.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
Architectures: amd64, arm64v8
-GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
Directory: 14/mariadb-tomcat
-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.6-postgres-tomcat, 14.6.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
Architectures: amd64, arm64v8
-GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
Directory: 14/postgres-tomcat
Tags: 14.4, 14.4.2, 14.4-mysql-tomcat, 14.4.2-mysql-tomcat
Architectures: amd64, arm64v8
-GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
Directory: 14.4/mysql-tomcat
Tags: 14.4-mariadb-tomcat, 14.4.2-mariadb-tomcat
Architectures: amd64, arm64v8
-GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
Directory: 14.4/mariadb-tomcat
Tags: 14.4-postgres-tomcat, 14.4.2-postgres-tomcat
Architectures: amd64, arm64v8
-GitCommit: 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790
+GitCommit: da38c291b3e953a4c94cfe25a2e2c6e0ffd4c7e8
Directory: 14.4/postgres-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index ed861a9..cfbec98 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -22,14 +22,14 @@ xwiki:14.4.2
xwiki:14.4.2-mariadb-tomcat
xwiki:14.4.2-mysql-tomcat
xwiki:14.4.2-postgres-tomcat
-xwiki:14.5
-xwiki:14.5-mariadb-tomcat
-xwiki:14.5-mysql-tomcat
-xwiki:14.5-postgres-tomcat
-xwiki:14.5.0
-xwiki:14.5.0-mariadb-tomcat
-xwiki:14.5.0-mysql-tomcat
-xwiki:14.5.0-postgres-tomcat
+xwiki:14.6
+xwiki:14.6-mariadb-tomcat
+xwiki:14.6-mysql-tomcat
+xwiki:14.6-postgres-tomcat
+xwiki:14.6.0
+xwiki:14.6.0-mariadb-tomcat
+xwiki:14.6.0-mysql-tomcat
+xwiki:14.6.0-postgres-tomcat
xwiki:latest
xwiki:lts
xwiki:lts-mariadb
diff --git a/xwiki_14.4.2-mariadb-tomcat/Dockerfile b/xwiki_14.4.2-mariadb-tomcat/Dockerfile
index 9dbb103..4d9209e 100644
--- a/xwiki_14.4.2-mariadb-tomcat/Dockerfile
+++ b/xwiki_14.4.2-mariadb-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:9-jre11
+FROM tomcat:9-jre11-openjdk
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
# Copy the JDBC driver in the XWiki webapp
# For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version
# used.
-ENV MARIADB_JDBC_VERSION="3.0.5"
-ENV MARIADB_JDBC_SHA256="e9532d9bca07c1263c32b00b495bd3ec7f2b79320513cabd762bf39ea09e68d9"
+ENV MARIADB_JDBC_VERSION="3.0.6"
+ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/xwiki_14.4.2-mysql-tomcat/Dockerfile b/xwiki_14.4.2-mysql-tomcat/Dockerfile
index f75b058..b63ca44 100644
--- a/xwiki_14.4.2-mysql-tomcat/Dockerfile
+++ b/xwiki_14.4.2-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:9-jre11
+FROM tomcat:9-jre11-openjdk
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/xwiki_14.4.2-postgres-tomcat/Dockerfile b/xwiki_14.4.2-postgres-tomcat/Dockerfile
index 7cf8a65..d6599b9 100644
--- a/xwiki_14.4.2-postgres-tomcat/Dockerfile
+++ b/xwiki_14.4.2-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:9-jre11
+FROM tomcat:9-jre11-openjdk
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index 948252c..11f8ff6 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="14.5"
+ENV XWIKI_VERSION="14.6"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fdf6397ebb0036920953d5e7f6d3896b3b8744517b8f00822c31380c24a3e170
+ENV XWIKI_DOWNLOAD_SHA256 9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_lts-mariadb/Dockerfile b/xwiki_lts-mariadb/Dockerfile
index 3d0d28f..d8d2e0d 100644
--- a/xwiki_lts-mariadb/Dockerfile
+++ b/xwiki_lts-mariadb/Dockerfile
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
# Copy the JDBC driver in the XWiki webapp
# For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version
# used.
-ENV MARIADB_JDBC_VERSION="3.0.5"
-ENV MARIADB_JDBC_SHA256="e9532d9bca07c1263c32b00b495bd3ec7f2b79320513cabd762bf39ea09e68d9"
+ENV MARIADB_JDBC_VERSION="3.0.6"
+ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/xwiki_stable-mariadb/Dockerfile b/xwiki_stable-mariadb/Dockerfile
index 8819d7e..a53b1da 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="14.5"
+ENV XWIKI_VERSION="14.6"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fdf6397ebb0036920953d5e7f6d3896b3b8744517b8f00822c31380c24a3e170
+ENV XWIKI_DOWNLOAD_SHA256 9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
@@ -62,8 +62,8 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \
# Copy the JDBC driver in the XWiki webapp
# For MariaDB, download the MariaDB driver version from the Maven Central repository to control the version
# used.
-ENV MARIADB_JDBC_VERSION="3.0.5"
-ENV MARIADB_JDBC_SHA256="e9532d9bca07c1263c32b00b495bd3ec7f2b79320513cabd762bf39ea09e68d9"
+ENV MARIADB_JDBC_VERSION="3.0.6"
+ENV MARIADB_JDBC_SHA256="977ca7980b777b5aa8d32678204296a108f3eacbc4f210887e39b19869fad0d3"
ENV MARIADB_JDBC_PREFIX="https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/${MARIADB_JDBC_VERSION}"
ENV MARIADB_JDBC_ARTIFACT="mariadb-java-client-${MARIADB_JDBC_VERSION}.jar"
ENV MARIADB_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MARIADB_JDBC_ARTIFACT}"
diff --git a/xwiki_stable-postgres/Dockerfile b/xwiki_stable-postgres/Dockerfile
index 4e23cb6..6462d4f 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="14.5"
+ENV XWIKI_VERSION="14.6"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 fdf6397ebb0036920953d5e7f6d3896b3b8744517b8f00822c31380c24a3e170
+ENV XWIKI_DOWNLOAD_SHA256 9676cc9eeae3cf47bccae037bff67ce2468e3bec1d126f903b4d3fe61bff8723
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \Relevant Maintainers:
|
|
Just as a reminder of #12767 (comment); you'll want to start proactively thinking about what to do with docker-library/docs#2162 👀 😞 ❤️ |
Thanks for the heads up we'll check it! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that this also contains changes for base image of tomcat in all versions and mariaDB connector version for all images.