Merge pull request #507 from usc-isi-i2/development

Development to Master merge for release - Security Updates and Build Fixes

Author: Bidisha010496

Dockerfile

@@ -0,0 +1,16 @@
+FROM openjdk:8-jdk-alpine
+RUN apk add --no-cache curl tar git
+
+WORKDIR /karma
+
+RUN wget https://mirrors.sonic.net/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+
+RUN tar xzvf apache-maven-3.6.3-bin.tar.gz
+
+RUN mkdir /karma/Web-Karma
+
+RUN git clone https://github.com/usc-isi-i2/Web-Karma /karma/Web-Karma
+
+RUN cd /karma/Web-Karma && /karma/apache-maven-3.6.3/bin/mvn clean install
+
+CMD cd /karma/Web-Karma/karma-web && /karma/apache-maven-3.6.3/bin/mvn jetty:run

karma-app/desktop/package.json

@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "electron": "10.1.3",
+    "electron": "10.2.0",
     "electron-builder": "^5.12.1",
     "electron-mocha": "^3.0.0",
     "fs-jetpack": "^0.9.0",