diff --git a/10/mysql-tomcat/xwiki/docker-entrypoint.sh b/10/mysql-tomcat/xwiki/docker-entrypoint.sh index 005b083c04751fea7f4e477293ae2d26fcd60edd..8f8685abb67724b9d16cadb18cf4ab7dc7006ce4 100755 --- a/10/mysql-tomcat/xwiki/docker-entrypoint.sh +++ b/10/mysql-tomcat/xwiki/docker-entrypoint.sh @@ -115,7 +115,7 @@ function configure() { file_env 'INDEX_HOST' 'localhost' file_env 'INDEX_PORT' '8983' - echo " Deploying XWiki in the $CONTEXT_PATH context" + echo " Deploying XWiki in the '$CONTEXT_PATH' context" if [ "$CONTEXT_PATH" == "ROOT" ]; then xwiki_set_cfg 'xwiki.webapppath' '' else diff --git a/10/postgres-tomcat/xwiki/docker-entrypoint.sh b/10/postgres-tomcat/xwiki/docker-entrypoint.sh index 005b083c04751fea7f4e477293ae2d26fcd60edd..8f8685abb67724b9d16cadb18cf4ab7dc7006ce4 100755 --- a/10/postgres-tomcat/xwiki/docker-entrypoint.sh +++ b/10/postgres-tomcat/xwiki/docker-entrypoint.sh @@ -115,7 +115,7 @@ function configure() { file_env 'INDEX_HOST' 'localhost' file_env 'INDEX_PORT' '8983' - echo " Deploying XWiki in the $CONTEXT_PATH context" + echo " Deploying XWiki in the '$CONTEXT_PATH' context" if [ "$CONTEXT_PATH" == "ROOT" ]; then xwiki_set_cfg 'xwiki.webapppath' '' else diff --git a/11/mysql-tomcat/.env b/11/mysql-tomcat/.env index 286b4edf4009be8cf981debb535f087fd5a84af0..8ae859e2db72f764e70bb17c1ecff1088df3222f 100644 --- a/11/mysql-tomcat/.env +++ b/11/mysql-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=11.10 +XWIKI_VERSION=11.10.1 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile index df22595464d4324760c0621de3ca92ef3ea045bf..716f293d4bdf9f54c745fc3f162aed8511c92eab 100644 --- a/11/mysql-tomcat/Dockerfile +++ b/11/mysql-tomcat/Dockerfile @@ -44,9 +44,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=11.10 +ENV XWIKI_VERSION=11.10.1 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e +ENV XWIKI_DOWNLOAD_SHA256 531c105af1848274185f3472a2d0f1c6de9c046ea64d0efba4f657545fc247be RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ diff --git a/11/mysql-tomcat/xwiki/docker-entrypoint.sh b/11/mysql-tomcat/xwiki/docker-entrypoint.sh index 005b083c04751fea7f4e477293ae2d26fcd60edd..8f8685abb67724b9d16cadb18cf4ab7dc7006ce4 100755 --- a/11/mysql-tomcat/xwiki/docker-entrypoint.sh +++ b/11/mysql-tomcat/xwiki/docker-entrypoint.sh @@ -115,7 +115,7 @@ function configure() { file_env 'INDEX_HOST' 'localhost' file_env 'INDEX_PORT' '8983' - echo " Deploying XWiki in the $CONTEXT_PATH context" + echo " Deploying XWiki in the '$CONTEXT_PATH' context" if [ "$CONTEXT_PATH" == "ROOT" ]; then xwiki_set_cfg 'xwiki.webapppath' '' else diff --git a/11/postgres-tomcat/.env b/11/postgres-tomcat/.env index 178f9959bf56a56c62e6f4c89923d855d0722151..94496d50d7fe30c7580fed3a80de98f31236d3e5 100644 --- a/11/postgres-tomcat/.env +++ b/11/postgres-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=11.10 +XWIKI_VERSION=11.10.1 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile index 54860786c705cc1902e411fe4b2611ff710d5d7f..fca613b26cc96716254fed64cb365440b7061e0d 100644 --- a/11/postgres-tomcat/Dockerfile +++ b/11/postgres-tomcat/Dockerfile @@ -44,9 +44,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=11.10 +ENV XWIKI_VERSION=11.10.1 ENV XWIKI_URL_PREFIX "https://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e +ENV XWIKI_DOWNLOAD_SHA256 531c105af1848274185f3472a2d0f1c6de9c046ea64d0efba4f657545fc247be RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ diff --git a/11/postgres-tomcat/xwiki/docker-entrypoint.sh b/11/postgres-tomcat/xwiki/docker-entrypoint.sh index 005b083c04751fea7f4e477293ae2d26fcd60edd..8f8685abb67724b9d16cadb18cf4ab7dc7006ce4 100755 --- a/11/postgres-tomcat/xwiki/docker-entrypoint.sh +++ b/11/postgres-tomcat/xwiki/docker-entrypoint.sh @@ -115,7 +115,7 @@ function configure() { file_env 'INDEX_HOST' 'localhost' file_env 'INDEX_PORT' '8983' - echo " Deploying XWiki in the $CONTEXT_PATH context" + echo " Deploying XWiki in the '$CONTEXT_PATH' context" if [ "$CONTEXT_PATH" == "ROOT" ]; then xwiki_set_cfg 'xwiki.webapppath' '' else diff --git a/build.gradle b/build.gradle index d7abf27b896abc9b590f1970eb5b98a2085b3fc5..914a490985d63dbbc46d38c6e3f56497d74ab38e 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ def tokens = [ xwikiSha256: 'e1feedd24f0a27ba4e36464913a2fcb43a60f9310283a8a6be017a1979618bb7' ], '11': [ - xwikiVersion: '11.10', - xwikiSha256: '793266765290a43776b73862773dd76106b496010969822f093b31e16e9c7a3e' + xwikiVersion: '11.10.1', + xwikiSha256: '531c105af1848274185f3472a2d0f1c6de9c046ea64d0efba4f657545fc247be' ] ]