-
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
XWiki LTS release #18166
Open
tmortagne
wants to merge
1
commit into
docker-library:master
Choose a base branch
from
tmortagne:patch-39
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
XWiki LTS release #18166
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 a01b16a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8805bdc..6515cb2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,34 +16,34 @@ Architectures: amd64, arm64v8
GitCommit: ffbda2123e322160254f342751bce9b978412e5f
Directory: 14/postgres-tomcat
-Tags: 15, 15.10, 15.10.15, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.15-mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts
+Tags: 15, 15.10, 15.10.15, 15-mysql-tomcat, 15.10-mysql-tomcat, 15.10.15-mysql-tomcat
Architectures: amd64, arm64v8
GitCommit: c66e808ef276252268d4da9854438ca0357a485b
Directory: 15/mysql-tomcat
-Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.15-mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb
+Tags: 15-mariadb-tomcat, 15.10-mariadb-tomcat, 15.10.15-mariadb-tomcat
Architectures: amd64, arm64v8
GitCommit: c66e808ef276252268d4da9854438ca0357a485b
Directory: 15/mariadb-tomcat
-Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.15-postgres-tomcat, lts-postgres-tomcat, lts-postgres
+Tags: 15-postgres-tomcat, 15.10-postgres-tomcat, 15.10.15-postgres-tomcat
Architectures: amd64, arm64v8
GitCommit: c66e808ef276252268d4da9854438ca0357a485b
Directory: 15/postgres-tomcat
-Tags: 16, 16.10, 16.10.1, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.1-mysql-tomcat, mysql-tomcat, stable-mysql-tomcat, stable-mysql, stable, latest
+Tags: 16, 16.10, 16.10.2, 16-mysql-tomcat, 16.10-mysql-tomcat, 16.10.2-mysql-tomcat, mysql-tomcat, lts-mysql-tomcat, lts-mysql, lts, stable-mysql-tomcat, stable-mysql, stable, latest
Architectures: amd64, arm64v8
-GitCommit: 430f87c1698844c262d110c61825b2ec98e86bf2
+GitCommit: beed20b75ae4c952be757cec1502151d2d2a7939
Directory: 16/mysql-tomcat
-Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.1-mariadb-tomcat, mariadb-tomcat, stable-mariadb-tomcat, stable-mariadb
+Tags: 16-mariadb-tomcat, 16.10-mariadb-tomcat, 16.10.2-mariadb-tomcat, mariadb-tomcat, lts-mariadb-tomcat, lts-mariadb, stable-mariadb-tomcat, stable-mariadb
Architectures: amd64, arm64v8
-GitCommit: 430f87c1698844c262d110c61825b2ec98e86bf2
+GitCommit: beed20b75ae4c952be757cec1502151d2d2a7939
Directory: 16/mariadb-tomcat
-Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.1-postgres-tomcat, postgres-tomcat, stable-postgres-tomcat, stable-postgres
+Tags: 16-postgres-tomcat, 16.10-postgres-tomcat, 16.10.2-postgres-tomcat, postgres-tomcat, lts-postgres-tomcat, lts-postgres, stable-postgres-tomcat, stable-postgres
Architectures: amd64, arm64v8
-GitCommit: 430f87c1698844c262d110c61825b2ec98e86bf2
+GitCommit: beed20b75ae4c952be757cec1502151d2d2a7939
Directory: 16/postgres-tomcat
Tags: 16.4, 16.4.6, 16.4-mysql-tomcat, 16.4.6-mysql-tomcat
diff --git a/_bashbrew-list b/_bashbrew-list
index 9cc6df6..42f931a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -38,10 +38,10 @@ xwiki:16.10
xwiki:16.10-mariadb-tomcat
xwiki:16.10-mysql-tomcat
xwiki:16.10-postgres-tomcat
-xwiki:16.10.1
-xwiki:16.10.1-mariadb-tomcat
-xwiki:16.10.1-mysql-tomcat
-xwiki:16.10.1-postgres-tomcat
+xwiki:16.10.2
+xwiki:16.10.2-mariadb-tomcat
+xwiki:16.10.2-mysql-tomcat
+xwiki:16.10.2-postgres-tomcat
xwiki:latest
xwiki:lts
xwiki:lts-mariadb
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 3e9e8a6..e5ee337 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,12 +1,12 @@
xwiki:14.10.21-mariadb-tomcat
xwiki:14.10.21-mysql-tomcat
xwiki:14.10.21-postgres-tomcat
+xwiki:15.10.15-mariadb-tomcat
+xwiki:15.10.15-mysql-tomcat
+xwiki:15.10.15-postgres-tomcat
xwiki:16.4.6-mariadb-tomcat
xwiki:16.4.6-mysql-tomcat
xwiki:16.4.6-postgres-tomcat
xwiki:latest
-xwiki:lts
-xwiki:lts-mariadb
-xwiki:lts-postgres
xwiki:stable-mariadb
xwiki:stable-postgres
diff --git a/xwiki_lts-mariadb/Dockerfile b/xwiki_15.10.15-mariadb-tomcat/Dockerfile
similarity index 100%
rename from xwiki_lts-mariadb/Dockerfile
rename to xwiki_15.10.15-mariadb-tomcat/Dockerfile
diff --git a/xwiki_lts-mariadb/tomcat/setenv.sh b/xwiki_15.10.15-mariadb-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_lts-mariadb/tomcat/setenv.sh
rename to xwiki_15.10.15-mariadb-tomcat/tomcat/setenv.sh
diff --git a/xwiki_lts-mariadb/xwiki/docker-entrypoint.sh b/xwiki_15.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_lts-mariadb/xwiki/docker-entrypoint.sh
rename to xwiki_15.10.15-mariadb-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_lts-mariadb/xwiki/hibernate.cfg.xml b/xwiki_15.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_lts-mariadb/xwiki/hibernate.cfg.xml
rename to xwiki_15.10.15-mariadb-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_lts/Dockerfile b/xwiki_15.10.15-mysql-tomcat/Dockerfile
similarity index 100%
rename from xwiki_lts/Dockerfile
rename to xwiki_15.10.15-mysql-tomcat/Dockerfile
diff --git a/xwiki_lts-postgres/tomcat/setenv.sh b/xwiki_15.10.15-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_lts-postgres/tomcat/setenv.sh
rename to xwiki_15.10.15-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki_lts/xwiki/docker-entrypoint.sh b/xwiki_15.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_lts/xwiki/docker-entrypoint.sh
rename to xwiki_15.10.15-mysql-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_lts/xwiki/hibernate.cfg.xml b/xwiki_15.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_lts/xwiki/hibernate.cfg.xml
rename to xwiki_15.10.15-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_lts-postgres/Dockerfile b/xwiki_15.10.15-postgres-tomcat/Dockerfile
similarity index 100%
rename from xwiki_lts-postgres/Dockerfile
rename to xwiki_15.10.15-postgres-tomcat/Dockerfile
diff --git a/xwiki_lts/tomcat/setenv.sh b/xwiki_15.10.15-postgres-tomcat/tomcat/setenv.sh
similarity index 100%
rename from xwiki_lts/tomcat/setenv.sh
rename to xwiki_15.10.15-postgres-tomcat/tomcat/setenv.sh
diff --git a/xwiki_lts-postgres/xwiki/docker-entrypoint.sh b/xwiki_15.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh
similarity index 100%
rename from xwiki_lts-postgres/xwiki/docker-entrypoint.sh
rename to xwiki_15.10.15-postgres-tomcat/xwiki/docker-entrypoint.sh
diff --git a/xwiki_lts-postgres/xwiki/hibernate.cfg.xml b/xwiki_15.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki_lts-postgres/xwiki/hibernate.cfg.xml
rename to xwiki_15.10.15-postgres-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki_latest/Dockerfile b/xwiki_latest/Dockerfile
index 90d6904..9181848 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.10.1"
+ENV XWIKI_VERSION="16.10.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f9f365da951626711ec44aebd0276517d8fe1522b1c209c0d3af9c302071ee6e
+ENV XWIKI_DOWNLOAD_SHA256 1a6287416db4243e3d40939e19509ca4ebe9e4f46f8fcf7204f223bcfff8b6e2
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 9969450..f655d49 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.10.1"
+ENV XWIKI_VERSION="16.10.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f9f365da951626711ec44aebd0276517d8fe1522b1c209c0d3af9c302071ee6e
+ENV XWIKI_DOWNLOAD_SHA256 1a6287416db4243e3d40939e19509ca4ebe9e4f46f8fcf7204f223bcfff8b6e2
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 f4912f7..06c0e0c 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.10.1"
+ENV XWIKI_VERSION="16.10.2"
ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 f9f365da951626711ec44aebd0276517d8fe1522b1c209c0d3af9c302071ee6e
+ENV XWIKI_DOWNLOAD_SHA256 1a6287416db4243e3d40939e19509ca4ebe9e4f46f8fcf7204f223bcfff8b6e2
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.