-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Update xwiki LTS to 17.10.2 #20570
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 LTS to 17.10.2 #20570
Conversation
Also provide tags for XWiki 17.10.1 which was apparently missing
|
Note: #20531 should be closed in favor of this one. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
library/xwiki
Outdated
| GitCommit: a7602018132edae5f6fc023fd172692ff2794452 | ||
|
|
||
| Tags: 17-postgres-tomcat, 17.10-postgres-tomcat, 17.10.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres | ||
| Tags: 17-postgres-tomcat, 17.10-postgres-tomcat, 17.10.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres, lts-postgres-tomcat, lts-postgres |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You might want to look at writing this file's contents with a script 😅 (that's what we do, and I'm happy to help with that if you need it)
there's still a 17.10.0 here that I think you meant to update to 17.10.2 👀
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmm indeed you might be right, thanks for checking!
|
Oh, there's a mix of 17.10.1 and 17.10.2 in here also; that's unusual, is it intentional? |
Yes, we had a problem apparently when performing 17.10.1 docker release (see #20531 mentioned in previous comment), so I'm fixing it here. |
Diff for 50a9d18:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8966ee9..c432214 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,34 +1,34 @@
Maintainers: XWiki Core Dev Team <[email protected]> (@xwiki)
GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git
-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
+Tags: 16, 16.10, 16.10.15, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.15-mysql-tomcat
Architectures: amd64, arm64v8
GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
Directory: 16/mysql-tomcat
-Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.15-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
+Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.15-mariadb-tomcat
Architectures: amd64, arm64v8
GitCommit: e0b607a585020256b8517302ac7ad2cb1e6e0e1e
Directory: 16/mariadb-tomcat
-Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.15-postgres-tomcat, lts-postgres-tomcat, lts-postgres
+Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.15-postgres-tomcat
Architectures: amd64, arm64v8
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
+Tags: 17, 17.10, 17.10.2, 17-mysql-tomcat, 17.10-mysql-tomcat, 17.10.2-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest, lts-mysql-tomcat, lts-mysql, lts
Architectures: amd64, arm64v8
-GitCommit: b1dc0934aa1761ef397459f7dbf866480e9fc6c9
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
Directory: 17/mysql-tomcat
-Tags: 17-mariadb-tomcat, 17.10-mariadb-tomcat, 17.10.0-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
+Tags: 17-mariadb-tomcat, 17.10-mariadb-tomcat, 17.10.2-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb, lts-mariadb-tomcat, lts-mariadb
Architectures: amd64, arm64v8
-GitCommit: b1dc0934aa1761ef397459f7dbf866480e9fc6c9
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
Directory: 17/mariadb-tomcat
-Tags: 17-postgres-tomcat, 17.10-postgres-tomcat, 17.10.0-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Tags: 17-postgres-tomcat, 17.10-postgres-tomcat, 17.10.2-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres, lts-postgres-tomcat, lts-postgres
Architectures: amd64, arm64v8
-GitCommit: b1dc0934aa1761ef397459f7dbf866480e9fc6c9
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
Directory: 17/postgres-tomcat
Tags: 17.4, 17.4.7, 17.4-mysql-tomcat, 17.4.7-mysql-tomcat
@@ -45,3 +45,18 @@ Tags: 17.4-postgres-tomcat, 17.4.7-postgres-tomcat
Architectures: amd64, arm64v8
GitCommit: f5b8a93c46ec436d3540c59f64ad0b7488cdc413
Directory: 17.4/postgres-tomcat
+
+Tags: 17.10.1, 17.10.1-mysql-tomcat
+Architectures: amd64, arm64v8
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
+Directory: 17.10.1/mysql-tomcat
+
+Tags: 17.10.1-mariadb-tomcat
+Architectures: amd64, arm64v8
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
+Directory: 17.10.1/mariadb-tomcat
+
+Tags: 17.10.1-postgres-tomcat
+Architectures: amd64, arm64v8
+GitCommit: a7602018132edae5f6fc023fd172692ff2794452
+Directory: 17.10.1/postgres-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 64671f1..cf88b03 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -26,10 +26,14 @@ xwiki:17.10
xwiki:17.10-mariadb-tomcat
xwiki:17.10-mysql-tomcat
xwiki:17.10-postgres-tomcat
-xwiki:17.10.0
-xwiki:17.10.0-mariadb-tomcat
-xwiki:17.10.0-mysql-tomcat
-xwiki:17.10.0-postgres-tomcat
+xwiki:17.10.1
+xwiki:17.10.1-mariadb-tomcat
+xwiki:17.10.1-mysql-tomcat
+xwiki:17.10.1-postgres-tomcat
+xwiki:17.10.2
+xwiki:17.10.2-mariadb-tomcat
+xwiki:17.10.2-mysql-tomcat
+xwiki:17.10.2-postgres-tomcat
xwiki:latest
xwiki:lts
xwiki:lts-mariadb
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index b046a73..10eccb7 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,12 @@
+xwiki:16.10.15-mariadb-tomcat
+xwiki:16.10.15-mysql-tomcat
+xwiki:16.10.15-postgres-tomcat
xwiki:17.4.7-mariadb-tomcat
xwiki:17.4.7-mysql-tomcat
xwiki:17.4.7-postgres-tomcat
-xwiki:latest
+xwiki:17.10.1-mariadb-tomcat
+xwiki:17.10.1-mysql-tomcat
+xwiki:17.10.1-postgres-tomcat
xwiki:lts
xwiki:lts-mariadb
xwiki:lts-postgres
-xwiki:stable-mariadb
-xwiki:stable-postgres
diff --git a/xwiki_lts-mariadb/Dockerfile b/xwiki_16.10.15-mariadb-tomcat/Dockerfile
similarity index 100%
copy from xwiki_lts-mariadb/Dockerfile
copy to xwiki_16.10.15-mariadb-tomcat/Dockerfile
diff --git a/xwiki_latest/tomcat/setenv.sh b/xwiki_16.10.15-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_latest/tomcat/setenv.sh
rename to xwiki_16.10.15-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_stable-mariadb/xwiki/docker-entrypoint.sh b/xwiki_16.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_stable-mariadb/xwiki/docker-entrypoint.sh
rename to xwiki_16.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_stable-mariadb/xwiki/hibernate.cfg.xml b/xwiki_16.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_stable-mariadb/xwiki/hibernate.cfg.xml
rename to xwiki_16.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_lts/Dockerfile b/xwiki_16.10.15-mysql-tomcat/Dockerfile
similarity index 100%
copy from xwiki_lts/Dockerfile
copy to xwiki_16.10.15-mysql-tomcat/Dockerfile
diff --git a/xwiki_stable-mariadb/tomcat/setenv.sh b/xwiki_16.10.15-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_stable-mariadb/tomcat/setenv.sh
rename to xwiki_16.10.15-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_latest/xwiki/docker-entrypoint.sh b/xwiki_16.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_latest/xwiki/docker-entrypoint.sh
rename to xwiki_16.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_latest/xwiki/hibernate.cfg.xml b/xwiki_16.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_latest/xwiki/hibernate.cfg.xml
rename to xwiki_16.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_lts-postgres/Dockerfile b/xwiki_16.10.15-postgres-tomcat/Dockerfile
similarity index 100%
copy from xwiki_lts-postgres/Dockerfile
copy to xwiki_16.10.15-postgres-tomcat/Dockerfile
diff --git a/xwiki_stable-postgres/tomcat/setenv.sh b/xwiki_16.10.15-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_stable-postgres/tomcat/setenv.sh
rename to xwiki_16.10.15-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_stable-postgres/xwiki/docker-entrypoint.sh b/xwiki_16.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_stable-postgres/xwiki/docker-entrypoint.sh
rename to xwiki_16.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_stable-postgres/xwiki/hibernate.cfg.xml b/xwiki_16.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_stable-postgres/xwiki/hibernate.cfg.xml
rename to xwiki_16.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_stable-mariadb/Dockerfile b/xwiki_17.10.1-mariadb-tomcat/Dockerfile
similarity index 96%
rename from xwiki_stable-mariadb/Dockerfile
rename to xwiki_17.10.1-mariadb-tomcat/Dockerfile
index 6a364f2..4b2051f 100644
--- a/xwiki_stable-mariadb/Dockerfile
+++ b/xwiki_17.10.1-mariadb-tomcat/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="17.10.0"
+ENV XWIKI_VERSION="17.10.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 7a1942782a74736ec4ebe654ede31a4454cff230bab6818a78db09452a2d1656
+ENV XWIKI_DOWNLOAD_SHA256 09ba677f0b43f09c3ae70fa2989b5b2bb9d16da00f04676e9240cfb167e2f753
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.5.6"
-ENV MARIADB_JDBC_SHA256="a129703efd7b0f334564d46753de999f09b3a361489a2eb647e6020390981cc9"
+ENV MARIADB_JDBC_VERSION="3.5.7"
+ENV MARIADB_JDBC_SHA256="07bb1229dc184f3313a5aef4c5a6b3207c8dbaa09db4a26814c936f004b4c526"
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_17.4.7-mariadb-tomcat/tomcat/setenv.sh b/xwiki_17.10.1-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
copy from xwiki_17.4.7-mariadb-tomcat/tomcat/setenv.sh
copy to xwiki_17.10.1-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_17.4.7-mariadb-tomcat/xwiki/docker-entrypoint.sh b/xwiki_17.10.1-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
copy from xwiki_17.4.7-mariadb-tomcat/xwiki/docker-entrypoint.sh
copy to xwiki_17.10.1-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_17.4.7-mariadb-tomcat/xwiki/hibernate.cfg.xml b/xwiki_17.10.1-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
copy from xwiki_17.4.7-mariadb-tomcat/xwiki/hibernate.cfg.xml
copy to xwiki_17.10.1-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_latest/Dockerfile b/xwiki_17.10.1-mysql-tomcat/Dockerfile
similarity index 98%
rename from xwiki_latest/Dockerfile
rename to xwiki_17.10.1-mysql-tomcat/Dockerfile
index 934e866..59e309b 100644
--- a/xwiki_latest/Dockerfile
+++ b/xwiki_17.10.1-mysql-tomcat/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="17.10.0"
+ENV XWIKI_VERSION="17.10.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 7a1942782a74736ec4ebe654ede31a4454cff230bab6818a78db09452a2d1656
+ENV XWIKI_DOWNLOAD_SHA256 09ba677f0b43f09c3ae70fa2989b5b2bb9d16da00f04676e9240cfb167e2f753
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_17.4.7-mariadb-tomcat/tomcat/setenv.sh b/xwiki_17.10.1-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
copy from xwiki_17.4.7-mariadb-tomcat/tomcat/setenv.sh
copy to xwiki_17.10.1-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_17.4.7-mysql-tomcat/xwiki/docker-entrypoint.sh b/xwiki_17.10.1-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
copy from xwiki_17.4.7-mysql-tomcat/xwiki/docker-entrypoint.sh
copy to xwiki_17.10.1-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_17.4.7-mysql-tomcat/xwiki/hibernate.cfg.xml b/xwiki_17.10.1-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
copy from xwiki_17.4.7-mysql-tomcat/xwiki/hibernate.cfg.xml
copy to xwiki_17.10.1-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_stable-postgres/Dockerfile b/xwiki_17.10.1-postgres-tomcat/Dockerfile
similarity index 98%
rename from xwiki_stable-postgres/Dockerfile
rename to xwiki_17.10.1-postgres-tomcat/Dockerfile
index 20a0246..53e3321 100644
--- a/xwiki_stable-postgres/Dockerfile
+++ b/xwiki_17.10.1-postgres-tomcat/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="17.10.0"
+ENV XWIKI_VERSION="17.10.1"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 7a1942782a74736ec4ebe654ede31a4454cff230bab6818a78db09452a2d1656
+ENV XWIKI_DOWNLOAD_SHA256 09ba677f0b43f09c3ae70fa2989b5b2bb9d16da00f04676e9240cfb167e2f753
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \
diff --git a/xwiki_17.4.7-mariadb-tomcat/tomcat/setenv.sh b/xwiki_17.10.1-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
copy from xwiki_17.4.7-mariadb-tomcat/tomcat/setenv.sh
copy to xwiki_17.10.1-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_17.4.7-postgres-tomcat/xwiki/docker-entrypoint.sh b/xwiki_17.10.1-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
copy from xwiki_17.4.7-postgres-tomcat/xwiki/docker-entrypoint.sh
copy to xwiki_17.10.1-postgres-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_17.4.7-postgres-tomcat/xwiki/hibernate.cfg.xml b/xwiki_17.10.1-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
copy from xwiki_17.4.7-postgres-tomcat/xwiki/hibernate.cfg.xml
copy to xwiki_17.10.1-postgres-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_lts-mariadb/Dockerfile b/xwiki_lts-mariadb/Dockerfile
index 6f627eb..8586a60 100644
--- a/xwiki_lts-mariadb/Dockerfile
+++ b/xwiki_lts-mariadb/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-jre21
+FROM tomcat:10-jre21
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -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.15"
+ENV XWIKI_VERSION="17.10.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
+ENV XWIKI_DOWNLOAD_SHA256 36bec1ea5f82f70f32e4488d8a58e9e44ed952e8657b3f83caf783d30c21a0ee
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.5.6"
-ENV MARIADB_JDBC_SHA256="a129703efd7b0f334564d46753de999f09b3a361489a2eb647e6020390981cc9"
+ENV MARIADB_JDBC_VERSION="3.5.7"
+ENV MARIADB_JDBC_SHA256="07bb1229dc184f3313a5aef4c5a6b3207c8dbaa09db4a26814c936f004b4c526"
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_lts-postgres/Dockerfile b/xwiki_lts-postgres/Dockerfile
index 96cc13f..f53532b 100644
--- a/xwiki_lts-postgres/Dockerfile
+++ b/xwiki_lts-postgres/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-jre21
+FROM tomcat:10-jre21
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -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.15"
+ENV XWIKI_VERSION="17.10.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
+ENV XWIKI_DOWNLOAD_SHA256 36bec1ea5f82f70f32e4488d8a58e9e44ed952e8657b3f83caf783d30c21a0ee
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 32e1f6a..b6af069 100644
--- a/xwiki_lts/Dockerfile
+++ b/xwiki_lts/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-jre21
+FROM tomcat:10-jre21
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -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.15"
+ENV XWIKI_VERSION="17.10.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 996a47663bdc3d5abe93f76bda73ceb670618d3602e67c7077cb5962db436819
+ENV XWIKI_DOWNLOAD_SHA256 36bec1ea5f82f70f32e4488d8a58e9e44ed952e8657b3f83caf783d30c21a0ee
RUN rm -rf /usr/local/tomcat/webapps/* && \
mkdir -p /usr/local/tomcat/temp && \
mkdir -p /usr/local/xwiki/data && \Relevant Maintainers:
|
tianon
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, that looks better 👍
| GitCommit: b1dc0934aa1761ef397459f7dbf866480e9fc6c9 | ||
| GitCommit: a7602018132edae5f6fc023fd172692ff2794452 | ||
|
|
||
| # Missing 17.10.1 release. To be removed at next release. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was going to ask about removing 17.10.1 after it's built/published, but that's already covered here 😄
Also provide tags for XWiki 17.10.1 which was apparently missing