-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Update XWiki LTS version to 16.10.15 #20370
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
Open
michitux
wants to merge
1
commit into
docker-library:master
Choose a base branch
from
michitux:patch-16
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 hidden or 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 dbb54e7:diff --git a/_bashbrew-cat b/_bashbrew-cat
index bbbb858..8966ee9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,19 +1,19 @@
Maintainers: XWiki Core Dev Team <[email protected]> (@xwiki)
GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
-Tags: 16, 16.10, 16.10.14, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.14-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
+Tags: 16, 16.10, 16.10.15, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.15-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
Architectures: amd64, arm64v8
-GitCommit: 62a954917dc052a551a79ffb0cc2b5397fa0c4ea
+GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
Directory: 16/mysql-tomcat
-Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.14-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
+Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.15-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
Architectures: amd64, arm64v8
-GitCommit: 62a954917dc052a551a79ffb0cc2b5397fa0c4ea
+GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
Directory: 16/mariadb-tomcat
-Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.14-postgres-tomcat, lts-postgres-tomcat, lts-postgres
+Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.15-postgres-tomcat, lts-postgres-tomcat, lts-postgres
Architectures: amd64, arm64v8
-GitCommit: 62a954917dc052a551a79ffb0cc2b5397fa0c4ea
+GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
Directory: 16/postgres-tomcat
Tags: 17, 17.10, 17.10.0, 17-mysql-tomcat, 17.10-mysql-tomcat, 17.10.0-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index d61fd60..64671f1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ xwiki:16.10
xwiki:16.10-mariadb-tomcat
xwiki:16.10-mysql-tomcat
xwiki:16.10-postgres-tomcat
-xwiki:16.10.14
-xwiki:16.10.14-mariadb-tomcat
-xwiki:16.10.14-mysql-tomcat
-xwiki:16.10.14-postgres-tomcat
+xwiki:16.10.15
+xwiki:16.10.15-mariadb-tomcat
+xwiki:16.10.15-mysql-tomcat
+xwiki:16.10.15-postgres-tomcat
xwiki:17
xwiki:17-mariadb-tomcat
xwiki:17-mysql-tomcat
diff --git a/xwiki_lts-mariadb/Dockerfile b/xwiki_lts-mariadb/Dockerfile
index c3019a8..6f627eb 100644
--- a/xwiki_lts-mariadb/Dockerfile
+++ b/xwiki_lts-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.10.14"
+ENV XWIKI_VERSION="16.10.15"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2d617d4f05206866187f60098d3f7e4116d83659d89f7b266d1b635ddc32f0fc
+ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_lts-postgres/Dockerfile b/xwiki_lts-postgres/Dockerfile
index 07d7ce5..96cc13f 100644
--- a/xwiki_lts-postgres/Dockerfile
+++ b/xwiki_lts-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.10.14"
+ENV XWIKI_VERSION="16.10.15"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2d617d4f05206866187f60098d3f7e4116d83659d89f7b266d1b635ddc32f0fc
+ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_lts/Dockerfile b/xwiki_lts/Dockerfile
index fe11e05..32e1f6a 100644
--- a/xwiki_lts/Dockerfile
+++ b/xwiki_lts/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.10.14"
+ENV XWIKI_VERSION="16.10.15"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 2d617d4f05206866187f60098d3f7e4116d83659d89f7b266d1b635ddc32f0fc
+ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
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 MYSQL_JDBC_VERSION="9.4.0"
-ENV MYSQL_JDBC_SHA256="49ed93c8b2bea9cb0929b85a8a28837b191d0f8eac6919fdcef16e36e2cd53b3"
+ENV MYSQL_JDBC_VERSION="9.5.0"
+ENV MYSQL_JDBC_SHA256="f2ca3dfaf00d4aa311470db7ea3051962944ba0cb60005a2f75467549c39f425"
ENV MYSQL_JDBC_PREFIX="https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/${MYSQL_JDBC_VERSION}"
ENV MYSQL_JDBC_ARTIFACT="mysql-connector-j-${MYSQL_JDBC_VERSION}.jar"
ENV MYSQL_JDBC_TARGET="/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/${MYSQL_JDBC_ARTIFACT}"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.