Febbweiss/docker-xwiki-jetty
1
0
Fork 0
mirror of https://github.com/Febbweiss/docker-xwiki-jetty.git synced 2026-03-04 22:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimization :

Browse Source 
* using alpine linux as base
* xwiki version as building arguments instead of hardcoded
* add libreoffice and its xwiki configuration to import Office documents
* set environment.permanentDirectory

Fix:
* SMTP environment variables set as empty string
This commit is contained in:
fecaille
2016-04-05 13:32:18 +02:00
parent 69488bb4c4
commit ea63c5f7e6
2 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
start.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
#!/bin/sh
if [ "$WIKI_CONTEXT" != "" ];then
if [ "$WIKI_CONTEXT" != "" ];then
if [ ! -f "${JETTY_BASE}/webapps/${WIKI_CONTEXT}" ];then
mv ${JETTY_BASE}/webapps/ROOT ${JETTY_BASE}/webapps/${WIKI_CONTEXT}
#curl http://download.forge.ow2.org/xwiki/xwiki-enterprise-web-8.0-milestone-2.war --output webapps/xwiki8.war
@@ -8,7 +8,7 @@ if [ "$WIKI_CONTEXT" != "" ];then
sed -i "s|MYSQL_USER|${MYSQL_USER}|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/hibernate.cfg.xml
sed -i "s|MYSQL_PASSWORD|${MYSQL_PASSWORD}|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/hibernate.cfg.xml
if [[ "${SMTP_HOST}" != "" ]]; then
sed -i "s|.*mail\.sender\.host = .*|mail.sender.host = ${SMTP_HOST}|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
sed -i "s|.*mail\.sender\.host = .*|mail.sender.host = ${SMTP_HOST}|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
fi
if [[ "${SMTP_LOGIN}" != "" ]]; then
sed -i "s|.*mail\.sender\.username = .*|mail.sender.username = ${SMTP_LOGIN}|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
@@ -27,8 +27,17 @@ if [ "$WIKI_CONTEXT" != "" ];then
else
sed -i "s|.*mail\.sender\.port = .*|mail.sender.port = 25|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
fi
set XWIKI_OPTS=%XWIKI_OPTS% -Doffice.path=/usr/lib/libreoffice/
sed -i "s|.*openoffice.serverType=0|openoffice.serverType=0|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
sed -i "s|.*openoffice.autoStart=false|openoffice.autoStart=true|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
sed -i "s|.*openoffice.homePath=/opt/openoffice.org3/|openoffice.homePath=/usr/lib/libreoffice/|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
sed -i "s|.*openoffice.taskExecutionTimeout=30000|openoffice.taskExecutionTimeout=120000|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
sed -i "s|.*environment.permanentDirectory=/var/local/xwiki/|environment.permanentDirectory=/var/local/xwiki/|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/xwiki.properties
fi
fi
java -jar "$JETTY_HOME/start.jar"
cd ${JETTY_BASE}
java -jar start.jar