diff --git a/8/mysql-tomcat/xwiki/docker-entrypoint.sh b/8/mysql-tomcat/xwiki/docker-entrypoint.sh index 1eb26e3d4cd05f9169b7067b6b8adb493d530055..6934f7964d6cebb6144873ba6060b46fcbe10913 100755 --- a/8/mysql-tomcat/xwiki/docker-entrypoint.sh +++ b/8/mysql-tomcat/xwiki/docker-entrypoint.sh @@ -93,6 +93,7 @@ function configure() { xwiki_set_cfg 'xwiki.store.attachment.hint' 'file' xwiki_set_cfg 'xwiki.store.attachment.versioning.hint' 'file' xwiki_set_cfg 'xwiki.store.attachment.recyclebin.hint' 'file' + echo ' Generating authentication validation and encryption keys...' xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" diff --git a/8/postgres-tomcat/xwiki/docker-entrypoint.sh b/8/postgres-tomcat/xwiki/docker-entrypoint.sh index 1eb26e3d4cd05f9169b7067b6b8adb493d530055..6934f7964d6cebb6144873ba6060b46fcbe10913 100755 --- a/8/postgres-tomcat/xwiki/docker-entrypoint.sh +++ b/8/postgres-tomcat/xwiki/docker-entrypoint.sh @@ -93,6 +93,7 @@ function configure() { xwiki_set_cfg 'xwiki.store.attachment.hint' 'file' xwiki_set_cfg 'xwiki.store.attachment.versioning.hint' 'file' xwiki_set_cfg 'xwiki.store.attachment.recyclebin.hint' 'file' + echo ' Generating authentication validation and encryption keys...' xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" diff --git a/9/mysql-tomcat/.env b/9/mysql-tomcat/.env index 773ee9c05185ecc40aa9a25d65b5a10cadabc8be..dae8ef97b5d3dde432c25d485e1eb07596d9241d 100644 --- a/9/mysql-tomcat/.env +++ b/9/mysql-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=9.10 +XWIKI_VERSION=9.10.1 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/9/mysql-tomcat/Dockerfile b/9/mysql-tomcat/Dockerfile index 76f5af91bda6f1c6e7b21657dedf7d6a37384278..2cd7df5b833a524f761eec2874fb0f0807ad714a 100644 --- a/9/mysql-tomcat/Dockerfile +++ b/9/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=9.10 +ENV XWIKI_VERSION=9.10.1 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64 +ENV XWIKI_DOWNLOAD_SHA256 36d139b4fc92b712e6c29ac0533d08cea7193cecd8144fc0584f422178379ccd RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ diff --git a/9/mysql-tomcat/xwiki/docker-entrypoint.sh b/9/mysql-tomcat/xwiki/docker-entrypoint.sh index 4261f2254fb7d47dac71cab296ecec10e42592ca..6e733afe09f5cdc7386fdc23aa09083071878512 100755 --- a/9/mysql-tomcat/xwiki/docker-entrypoint.sh +++ b/9/mysql-tomcat/xwiki/docker-entrypoint.sh @@ -95,6 +95,7 @@ function configure() { xwiki_set_cfg 'xwiki.store.attachment.recyclebin.content.hint' 'file' echo ' Using filesystem-based deleted documents...' xwiki_set_cfg 'xwiki.store.recyclebin.content.hint' 'file' + echo ' Generating authentication validation and encryption keys...' xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" diff --git a/9/postgres-tomcat/.env b/9/postgres-tomcat/.env index 24c23536faaf37d31d2cc5aef33048c5c1209f66..40c8746a5bc7d9d9f9ef57c2e2770810b8062396 100644 --- a/9/postgres-tomcat/.env +++ b/9/postgres-tomcat/.env @@ -1,5 +1,5 @@ # Default environment values -XWIKI_VERSION=9.10 +XWIKI_VERSION=9.10.1 DB_USER=xwiki DB_PASSWORD=xwiki DB_DATABASE=xwiki diff --git a/9/postgres-tomcat/Dockerfile b/9/postgres-tomcat/Dockerfile index cdcb340dbd3433c6acb90020a30482020b370cde..060acedc65af8c33b1fdcdbeac1da49b2937d943 100644 --- a/9/postgres-tomcat/Dockerfile +++ b/9/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=9.10 +ENV XWIKI_VERSION=9.10.1 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}" -ENV XWIKI_DOWNLOAD_SHA256 a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64 +ENV XWIKI_DOWNLOAD_SHA256 36d139b4fc92b712e6c29ac0533d08cea7193cecd8144fc0584f422178379ccd RUN rm -rf /usr/local/tomcat/webapps/* && \ mkdir -p /usr/local/tomcat/temp && \ mkdir -p /usr/local/xwiki/data && \ diff --git a/9/postgres-tomcat/xwiki/docker-entrypoint.sh b/9/postgres-tomcat/xwiki/docker-entrypoint.sh index 4261f2254fb7d47dac71cab296ecec10e42592ca..6e733afe09f5cdc7386fdc23aa09083071878512 100755 --- a/9/postgres-tomcat/xwiki/docker-entrypoint.sh +++ b/9/postgres-tomcat/xwiki/docker-entrypoint.sh @@ -95,6 +95,7 @@ function configure() { xwiki_set_cfg 'xwiki.store.attachment.recyclebin.content.hint' 'file' echo ' Using filesystem-based deleted documents...' xwiki_set_cfg 'xwiki.store.recyclebin.content.hint' 'file' + echo ' Generating authentication validation and encryption keys...' xwiki_set_cfg 'xwiki.authentication.validationKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" xwiki_set_cfg 'xwiki.authentication.encryptionKey' "$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" diff --git a/build.gradle b/build.gradle index b0ee795d6d8bc1b5d754739f98470f2ca73bbe5c..39a2e8510c7d74bab548a3cef4d35346c78bf4db 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ def tokens = [ xwikiSha256: '52ed122c44984748a729a784c94cb70ccf0d2fa34c2340d0fd45c75deb3b0bc9' ], '9' : [ - xwikiVersion: '9.10', - xwikiSha256: 'a98c966e53721dfb770b9018d62476cdb1e92aa4eed894b4ab13747988b6dd64' + xwikiVersion: '9.10.1', + xwikiSha256: '36d139b4fc92b712e6c29ac0533d08cea7193cecd8144fc0584f422178379ccd' ] ]