[zeppelin] branch master updated: [ZEPPELIN-5753] Improve Docker build (#4379)

[pdallig]

This is an automated email from the ASF dual-hosted git repository.

pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 6b9d42b696 [ZEPPELIN-5753] Improve Docker build (#4379)
6b9d42b696 is described below

commit 6b9d42b696ceb280e98b766dd59d5b10dd0ef6bd
Author: Philipp Dallig <philipp.dal...@gmail.com>
AuthorDate: Tue Jun 14 08:39:18 2022 +0200

    [ZEPPELIN-5753] Improve Docker build (#4379)
---
 Dockerfile                | 5 +++--
 zeppelin-web/package.json | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d17f351655..431b89c8cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,13 @@
 FROM openjdk:8 as builder
 ADD . /workspace/zeppelin
 WORKDIR /workspace/zeppelin
+ENV MAVEN_OPTS="-Xms1024M -Xmx2048M -XX:MaxMetaspaceSize=1024m 
-XX:-UseGCOverheadLimit 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 # Allow npm and bower to run with root privileges
 RUN echo "unsafe-perm=true" > ~/.npmrc && \
     echo '{ "allow_root": true }' > ~/.bowerrc && \
-    ./mvnw -B package -DskipTests -Pbuild-distr -Pspark-3.1 -Pinclude-hadoop 
-Phadoop3 -Pspark-scala-2.12 -Pweb-angular && \
+    ./mvnw -B package -DskipTests -Pbuild-distr -Pspark-3.2 -Pinclude-hadoop 
-Phadoop3 -Pspark-scala-2.12 -Pweb-angular && \
     # Example with doesn't compile all interpreters
-    # ./mvnw -B package -DskipTests -Pbuild-distr -Pspark-3.1 -Pinclude-hadoop 
-Phadoop3 -Pspark-scala-2.12 -Pweb-angular -pl 
'!groovy,!submarine,!livy,!hbase,!pig,!file,!flink,!ignite,!kylin' && \
+    # ./mvnw -B package -DskipTests -Pbuild-distr -Pspark-3.2 -Pinclude-hadoop 
-Phadoop3 -Pspark-scala-2.12 -Pweb-angular -pl 
'!groovy,!submarine,!livy,!hbase,!pig,!file,!flink,!ignite,!kylin' && \
     mv /workspace/zeppelin/zeppelin-distribution/target/zeppelin-*/zeppelin-* 
/opt/zeppelin/ && \
     # Removing stuff saves time, because docker creates a temporary layer
     rm -rf ~/.m2 && \
diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
index dcceac42d6..6f3e7f94b7 100644
--- a/zeppelin-web/package.json
+++ b/zeppelin-web/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "angular-ui-grid": "4.4.6",
-    "angular-viewport-watch": "github:wix/angular-viewport-watch",
+    "angular-viewport-watch": 
"git+https://github.com/wix/angular-viewport-watch.git";,
     "ansi_up": "^2.0.2",
     "github-markdown-css": "2.6.0",
     "grunt-angular-templates": "^0.5.7",