Merge branch 'feature/baseImageEvaluationServer' into development

Author: David Baum

evaluationserver/Dockerfile

@@ -1,11 +1,7 @@
-FROM ruby:2.4.5
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        rails rake build-essential nodejs default-libmysqlclient-dev mysql-client\
-    && rm -rf /var/lib/apt/lists/* && mkdir -p /usr/src/app
+FROM getaviz/evaluationserver-base:1.2.0
 WORkDIR /usr/src/app/
 COPY . .
-RUN gem update --system && gem install bundler && bundle install --jobs 20 --retry 5 && gem install bundler
+RUN bundle install --jobs 20 --retry 5 && gem install bundler
 LABEL maintainer="[email protected]" \
       version="1.0"
 EXPOSE 8081

generator2/org.getaviz.generator/Dockerfile

@@ -4,7 +4,7 @@ COPY . /tmp/generator2/
 WORKDIR /tmp/generator2/
 RUN mvn package
 
-FROM getaviz/generator2-base:1.1.0
+FROM getaviz/generator2-base:1.2.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,4 +1,4 @@
-FROM getaviz/ui-base:1.1.0
+FROM getaviz/ui-base:1.2.0
 COPY . /var/www/html/ui
 WORKDIR /var/www/html/ui
 RUN npm install