Merge pull request #90 from softvis-research/development

New Release v1.2.0

Author: naraesk

.travis.yml

@@ -1,19 +1,22 @@
 matrix:
   include:
+    - name: Docker
+      script:
+        - docker-compose -f docker-compose.test.yml run tests
     - name: Generator
       language: java
       before_install:
         - cd generator
         - cd org.svis.generator.releng/
       script:
         - mvn clean install -fae
-    - name: Generator2
-      language: java
-      before_install:
-        - cd generator2
-        - cd org.getaviz.generator/
-      script:
-        - mvn clean install
+    #- name: Generator2
+      #language: java
+      #before_install:
+        #- cd generator2
+        #- cd org.getaviz.generator/
+      #script:
+        #- mvn clean install
     - name: Evaluation Server
       language: ruby
       before_script:
@@ -33,3 +36,7 @@ matrix:
         - cat ./config/database.yml
         - echo $RAILS_ENV
         - bundle exec rake --version
+notifications:
+  email:
+    on_success: change # options: change, never, always
+    on_failure: always # options: change, never, always

README.md

@@ -25,7 +25,7 @@ Getaviz is mainly developed by the research group [Visual Software Analytics](ht
 * [Pascal Kovacs](https://github.com/PascalKovacs)
 * [David Baum](http://home.uni-leipzig.de/svis/Research%20Group/#DavidBaum)
 
-Many thanks to all the contributors who have improved Getaviz by implementing new features or fixing bugs, especially: Denise Zilch, [André Naumann](https://github.com/sk2andy), [Stefan Faulhaber](https://github.com/StefanFaulhaber), [Dan Häberlein](https://github.com/dhaeb),  [Lisa Vogelsberg](https://github.com/Valekta/), [Aaron Sillus](https://github.com/AaronSil)
+Many thanks to all the contributors who have improved Getaviz by implementing new features or fixing bugs, especially: Denise Zilch, [André Naumann](https://github.com/sk2andy), [Stefan Faulhaber](https://github.com/StefanFaulhaber), [Dan Häberlein](https://github.com/dhaeb),  [Lisa Vogelsberg](https://github.com/Valekta/), [Aaron Sillus](https://github.com/AaronSil), and [Jens Thomann](https://github.com/jt23coqi)
 
 ## Publications
 * David Baum, Jens Dietrich, Craig Anslow, Richard Müller: [Visualizing Design Erosion: How Big Balls of Mud are Made](https://arxiv.org/abs/1807.06136), IEEE VISSOFT, 2018.

docker-compose.test.yml

@@ -0,0 +1,42 @@
+version: "3"
+services:
+    frontend:
+        build: ui/
+        restart: always
+        volumes:
+            - data-gen:/var/www/html/ui/data-gen
+        networks:
+            - default
+        depends_on:
+            - backend
+    backend:
+        build: generator2/org.getaviz.generator/
+        restart: always
+        volumes: 
+            - data-gen:/var/lib/jetty/data-gen
+        networks:
+            - default
+        depends_on:
+            - neo4j
+    tests:
+        build: integrationtests/
+        command: "/bin/wait-for-it.sh neo4j:7687 -s -t 30 -- mvn install"
+        networks:
+            - default
+        depends_on:
+            - neo4j
+            - frontend
+            - backend
+    neo4j:
+        image: neo4j:3.5.1
+        restart: always
+        environment:
+            NEO4J_AUTH: "none"
+        networks:
+            - default
+volumes:
+  data-gen:
+    
+networks:
+    default:
+        driver: bridge

docker-compose.yml

@@ -13,8 +13,8 @@ services:
         restart: always
         env_file: evaluationserver/env
         command: "./bin/wait-for-it.sh db:3306 -s -t 30 -- ./bin/docker_start"
-        volumes:
-        - ./evaluationserver:/usr/src/app
+        #volumes:
+        #- ./evaluationserver:/usr/src/app
         ports:
             - "8081:8081" 
         depends_on:
@@ -23,19 +23,49 @@ services:
         build: ui/
         restart: always
         volumes:
-            - ./ui:/var/www/html/ui
+            #- ./ui:/var/www/html/ui # uncomment only for ui development
+            - data-gen:/var/www/html/ui/data-gen
         ports:
             - "8082:80"
+        networks:
+            - default
+        depends_on:
+            - backend
     backend:
         build: generator2/org.getaviz.generator/
         restart: always
-        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:/var/lib/jetty/output/
-            - ./generator2/databases:/var/lib/jetty/databases/
+        volumes: 
+            - data-gen:/var/lib/jetty/data-gen
+            #- ./generator2/org.getaviz.generator/target/org.getaviz.generator-1.0.0-SNAPSHOT.war:/var/lib/jetty/webapps/root.war # uncomment only for generator development
+            #- ./generator2/org.getaviz.generator/settings.properties:/opt/config/settings.properties # uncomment only for generator development
+            #- ./generator2/output:/var/lib/jetty/output/ # uncomment only for generator development
+            #- ./generator2/logs:/var/lib/jetty/logs # uncomment only for generator development
         ports:
             - "8083:8080"
+        networks:
+            - default
+        depends_on:
+            - neo4j
+            - volumes-provisioner
+    neo4j:
+        image: neo4j:3.5.1
+        restart: always
+        ports:
+            - "7474:7474"
+            - "7687:7687"
+        environment:
+            NEO4J_AUTH: "none"
+        networks:
+            - default
+    volumes-provisioner:
+        image: hasnat/volumes-provisioner
+        environment:
+            PROVISION_DIRECTORIES: "100:101:0755:/var/data"
+        volumes:
+            - data-gen:/var/data
 volumes:
-  bundle:
-    driver: local
+  data-gen:
+    
+networks:
+    default:
+        driver: bridge

evaluationserver/Dockerfile

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

evaluationserver/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails'
+gem 'rails', '~> 5.2.1'
 
 # Use sqlite3 as the database for Active Record
 #gem 'sqlite3'
@@ -73,7 +73,7 @@ end
 gem "font-awesome-rails"
 gem "therubyracer"
 gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
-gem 'bootstrap-sass', '~> 3.2.0'
+gem 'bootstrap-sass', '~> 3.3.5.1'
 gem "paperclip"
 gem "nokogiri"
 gem "rubyzip"