Merge branch 'feature/automate_docker_build' into development

Author: David Baum

docker-compose.yml

@@ -31,8 +31,8 @@ services:
         volumes:
             - ./generator2/org.getaviz.generator/target/org.getaviz.generator-1.0.0-SNAPSHOT.war:/var/lib/jetty/webapps/root.war
             - ./settings.properties:/opt/config/settings.properties
-            - ./generator2/output:/opt/output/
-            - ./generator2/databases:/opt/databases/
+            - ./generator2/output:/var/lib/jetty/output/
+            - ./generator2/databases:/var/lib/jetty/databases/
         ports:
             - "8083:8080"
 volumes:

generator2/org.getaviz.generator/Dockerfile

@@ -1,8 +1,16 @@
+FROM maven:3.6.0-jdk-8 AS MAVEN_TOOL_CHAIN
+RUN mkdir -p /tmp/generator2/
+COPY pom.xml /tmp/generator2/
+COPY src /tmp/generator2/src/
+WORKDIR /tmp/generator2/
+RUN mvn package
+
 FROM jetty:9.4.12-jre8
-ADD target/org.getaviz.generator*.war /var/lib/jetty/webapps/root.war
-USER root
-RUN mkdir -p /usr/local/jetty/logs
+COPY --from=MAVEN_TOOL_CHAIN /tmp/generator2/target/org.getaviz.generator*.war /var/lib/jetty/webapps/root.war
+RUN mkdir -p /var/lib/jetty/logs/
+RUN mkdir -p /var/lib/jetty/databases/
+RUN mkdir -p /var/lib/jetty/output/
 EXPOSE 8080
-VOLUME ["/var/lib/jetty/webapps/", "/opt/config/", "/opt/databases/"]
+VOLUME ["/var/lib/jetty/webapps/", "/opt/config/", "/var/lib/jetty/databases/", "/var/lib/jetty/output/"]
 LABEL maintainer="[email protected]" \
  version="1.0"

generator2/org.getaviz.generator/src/main/resources/log4j.properties

@@ -5,7 +5,7 @@ log4j.logger.org.apache.commons.beanutils.converters=ERROR
  Direct log messages to a log file
 log4j.appender.file=org.apache.log4j.FileAppender
 log4j.appender.file.Append=false
-log4j.appender.file.File=${jetty.home}/logs/jetty.log
+log4j.appender.file.File=${jetty.base}/jetty.log
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
 log4j.appender.file.Threshold=DEBUG

generator2/output/.gitignore

@@ -0,0 +1 @@
+ 

settings.properties

@@ -14,14 +14,14 @@
 
 # Directory to which the visualization will be generateds, relative to the directory of this project
 # output.path = ./output/
-output.path = /opt/output/
+output.path = /var/lib/jetty/output/
 
 # If true, the x3d files is converted to multipart automatically, if InstantPlayer is installed locally
 # convert_to_multipart = false
 
 # Directory of the used jQAssistant database, relative to the directory of this project
 # database_name = ../databases/graph.db
-database_name = /opt/databases/graph.db
+database_name = /var/lib/jetty/databases/graph.db
 
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #