Merge branch 'feature/useUiBaseImage' into development

Author: David Baum

generator2/org.getaviz.generator/Dockerfile

@@ -4,7 +4,7 @@ COPY . /tmp/generator2/
 WORKDIR /tmp/generator2/
 RUN mvn package
 
-FROM getaviz/generator2-base:1.0.0
+FROM getaviz/generator2-base:1.1.0
 COPY --from=MAVEN_TOOL_CHAIN /tmp/generator2/target/org.getaviz.generator*.war /var/lib/jetty/webapps/root.war
 COPY settings.properties /opt/config/settings.properties
 USER root

ui/Dockerfile

@@ -1,10 +1,6 @@
-FROM php:7.2-apache
+FROM getaviz/ui-base:1.1.0
 COPY . /var/www/html/ui
 WORKDIR /var/www/html/ui
-RUN apt-get update && \
-    curl -sL https://deb.nodesource.com/setup_8.x | bash - &&\
-    apt-get install -y build-essential nodejs git &&\
-    mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" &&\
-    npm install
+RUN npm install
 LABEL maintainer="[email protected]" \
       version="1.0"