Quellcode durchsuchen

added wiki context

DigitalLumberjack vor 9 Jahren
Ursprung
Commit
e0af61c2eb
3 geänderte Dateien mit 7 neuen und 6 gelöschten Zeilen
  1. 3 3
      Dockerfile
  2. 1 0
      README.md
  3. 3 3
      start.sh

+ 3 - 3
Dockerfile

@@ -6,9 +6,9 @@ ENV MYSQL_HOST db
 
 RUN curl http://download.forge.ow2.org/xwiki/xwiki-enterprise-web-8.0-milestone-2.war --output ${JETTY_BASE}/xwiki8.war
 RUN curl http://download.forge.ow2.org/xwiki/xwiki-enterprise-ui-mainwiki-all-8.0-milestone-2.xar --output ${JETTY_BASE}/xwiki8.xar
-RUN unzip ${JETTY_BASE}/xwiki8.war -d ${JETTY_BASE}/webapps/ROOT/
-RUN curl http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar --output ${JETTY_BASE}/webapps/ROOT/WEB-INF/lib/mysql-connector-java-5.jar
+RUN unzip ${JETTY_BASE}/xwiki8.war -d ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/
+RUN curl http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar --output ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/lib/mysql-connector-java-5.jar
 
 ADD ./start.sh /usr/local/bin/start.sh
-ADD ./config/hibernate.cfg.xml ${JETTY_BASE}/webapps/ROOT/WEB-INF/
+ADD ./config/hibernate.cfg.xml ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/
 CMD ["/usr/local/bin/start.sh"]

+ 1 - 0
README.md

@@ -6,3 +6,4 @@ Use the following ENV when running :
 - MYSQL_USER : the mysql user
 - MYSQL_PASSWORD : the mysql password
 - MYSQL_HOST : the hostname of the linked database container
+- WIKI_CONTEXT : the context of the website (ROOT for no context)

+ 3 - 3
start.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 #curl http://download.forge.ow2.org/xwiki/xwiki-enterprise-web-8.0-milestone-2.war --output webapps/xwiki8.war
-sed -i "s|MYSQL_HOST|${MYSQL_HOST}|" ${JETTY_BASE}/webapps/ROOT/WEB-INF/hibernate.cfg.xml
-sed -i "s|MYSQL_USER|${MYSQL_USER}|" ${JETTY_BASE}/webapps/ROOT/WEB-INF/hibernate.cfg.xml
-sed -i "s|MYSQL_PASSWORD|${MYSQL_PASSWORD}|" ${JETTY_BASE}/webapps/ROOT/WEB-INF/hibernate.cfg.xml
+sed -i "s|MYSQL_HOST|${MYSQL_HOST}|" ${JETTY_BASE}/webapps/${WIKI_CONTEXT}/WEB-INF/hibernate.cfg.xml
+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
 
 java -jar "$JETTY_HOME/start.jar"