-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Update XWiki stable version to 16.10.0 #17989
Open
mflorea
wants to merge
1
commit into
docker-library:master
Choose a base branch
from
mflorea:patch-32
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Diff for 7d235e2:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2e1dbc2..ccb4dba 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,19 +31,19 @@ Architectures: amd64, arm64v8
GitCommit: 565c797b072f359d1f6492a032bf088be1fff5cf
Directory: 15/postgres-tomcat
-Tags: 16, 16.9, 16.9.0, 16-mysql-tomcat, 16.9-mysql-tomcat, 16.9.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
+Tags: 16, 16.10, 16.10.0, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
Architectures: amd64, arm64v8
-GitCommit: 7cc89adf7110f44841de531508b2669a4d5568e5
+GitCommit: 7976fa78fc21571e035fa24c7a57f03292fb0dae
Directory: 16/mysql-tomcat
-Tags: 16-mariadb-tomcat, 16.9-mariadb-tomcat, 16.9.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
+Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
Architectures: amd64, arm64v8
-GitCommit: 7cc89adf7110f44841de531508b2669a4d5568e5
+GitCommit: 7976fa78fc21571e035fa24c7a57f03292fb0dae
Directory: 16/mariadb-tomcat
-Tags: 16-postgres-tomcat, 16.9-postgres-tomcat, 16.9.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
Architectures: amd64, arm64v8
-GitCommit: 7cc89adf7110f44841de531508b2669a4d5568e5
+GitCommit: 7976fa78fc21571e035fa24c7a57f03292fb0dae
Directory: 16/postgres-tomcat
Tags: 16.4, 16.4.5, 16.4-mysql-tomcat, 16.4.5-mysql-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 2911109..51dcd1d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -34,14 +34,14 @@ xwiki:16.4.5
xwiki:16.4.5-mariadb-tomcat
xwiki:16.4.5-mysql-tomcat
xwiki:16.4.5-postgres-tomcat
-xwiki:16.9
-xwiki:16.9-mariadb-tomcat
-xwiki:16.9-mysql-tomcat
-xwiki:16.9-postgres-tomcat
-xwiki:16.9.0
-xwiki:16.9.0-mariadb-tomcat
-xwiki:16.9.0-mysql-tomcat
-xwiki:16.9.0-postgres-tomcat
+xwiki:16.10
+xwiki:16.10-mariadb-tomcat
+xwiki:16.10-mysql-tomcat
+xwiki:16.10-postgres-tomcat
+xwiki:16.10.0
+xwiki:16.10.0-mariadb-tomcat
+xwiki:16.10.0-mysql-tomcat
+xwiki:16.10.0-postgres-tomcat
xwiki:latest
xwiki:lts
xwiki:lts-mariadb
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index 85d0fcd..8fce3f3 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="16.9.0"
+ENV XWIKI_VERSION="16.10.0"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 9a66ce45c49863c0e8cbdae0fb5e5dfab317a1c0c3a45e7c33fb61b09b39fe23
+ENV XWIKI_DOWNLOAD_SHA256 742f762b067f1ad62bd2d8fe800b288895bb3066b07ee62a7aedb814da241c7a
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_stable-mariadb/Dockerfile
index f7c21e7..e97f3db 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="16.9.0"
+ENV XWIKI_VERSION="16.10.0"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 9a66ce45c49863c0e8cbdae0fb5e5dfab317a1c0c3a45e7c33fb61b09b39fe23
+ENV XWIKI_DOWNLOAD_SHA256 742f762b067f1ad62bd2d8fe800b288895bb3066b07ee62a7aedb814da241c7a
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
# We take the database driver version from the Maven Central repository since we want to control the version
# used and have it being consistent with what is tested in the CI.
-ENV MARIADB_JDBC_VERSION="3.4.1"
-ENV MARIADB_JDBC_SHA256="f60e4b282f1f4bdb74f0a26436ba7078a5e480b6f6702f6a7b45d9ba5e604a24"
+ENV MARIADB_JDBC_VERSION="3.5.1"
+ENV MARIADB_JDBC_SHA256="50a50c4a3c13c30dfbd40587f7ad9a496197d285ede0948641d9eee68fdf2106"
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 bca92cc..74d404e 100644
--- a/xwiki_stable-postgres/Dockerfile
+++ b/xwiki_stable-postgres/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="16.9.0"
+ENV XWIKI_VERSION="16.10.0"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 9a66ce45c49863c0e8cbdae0fb5e5dfab317a1c0c3a45e7c33fb61b09b39fe23
+ENV XWIKI_DOWNLOAD_SHA256 742f762b067f1ad62bd2d8fe800b288895bb3066b07ee62a7aedb814da241c7a
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \ Relevant Maintainers:
|
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.
No description provided.