(zeppelin) branch master updated: [ZEPPELIN-6001] k8s images fix (#4729)

[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 0f366d8a00 [ZEPPELIN-6001] k8s images fix (#4729)
0f366d8a00 is described below

commit 0f366d8a000cf313cce364b5a95dc84c1e600f90
Author: th1nksnow <114925852+th1nks...@users.noreply.github.com>
AuthorDate: Wed Mar 13 14:56:35 2024 +0300

    [ZEPPELIN-6001] k8s images fix (#4729)
    
    * Update zeppelin-interpreter Dockerfile
    
    fixed ARG version;
    Error "bzip2: Compressed file ends unexpectedly;" fixed by adding ---no-iri 
flag to wget
    
    * Update zeppelin-server Dockerfile
    
    fixed ARG version;
    fixed JAVA_HOME env.
    
    * Update scripts/docker/zeppelin-interpreter/Dockerfile
    
    Co-authored-by: Philipp Dallig <philipp.dal...@gmail.com>
    
    ---------
    
    Co-authored-by: Philipp Dallig <philipp.dal...@gmail.com>
---
 scripts/docker/zeppelin-interpreter/Dockerfile | 4 ++--
 scripts/docker/zeppelin-server/Dockerfile      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/docker/zeppelin-interpreter/Dockerfile 
b/scripts/docker/zeppelin-interpreter/Dockerfile
index 453411bb45..c01f1c6a49 100644
--- a/scripts/docker/zeppelin-interpreter/Dockerfile
+++ b/scripts/docker/zeppelin-interpreter/Dockerfile
@@ -20,7 +20,7 @@ FROM ubuntu:22.04
 
 LABEL maintainer="Apache Software Foundation <d...@zeppelin.apache.org>"
 
-ARG version="0.10.0"
+ARG version="0.12.0-SNAPSHOT"
 
 ENV VERSION="${version}" \
     ZEPPELIN_HOME="/opt/zeppelin"
@@ -30,7 +30,7 @@ ENV VERSION="${version}" \
 RUN set -ex && \
     /usr/bin/apt-get update && \
     DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y 
openjdk-11-jre-headless wget tini bzip2 && \
-    /usr/bin/wget -qO- 
https://micromamba.snakepit.net/api/micromamba/linux-64/latest | tar -xvj 
bin/micromamba && \
+    /usr/bin/wget --remote-encoding=utf-8 -qO- 
https://micromamba.snakepit.net/api/micromamba/linux-64/latest | tar -xvj 
bin/micromamba && \
     # Cleanup
     /usr/bin/apt-get clean && \
     /bin/rm -rf /var/lib/apt/lists/*
diff --git a/scripts/docker/zeppelin-server/Dockerfile 
b/scripts/docker/zeppelin-server/Dockerfile
index 6a56062067..aacbe54845 100644
--- a/scripts/docker/zeppelin-server/Dockerfile
+++ b/scripts/docker/zeppelin-server/Dockerfile
@@ -36,11 +36,11 @@ RUN set -ex && \
     apt-get autoclean && \
     apt-get clean
 
-ARG version="0.10.0"
+ARG version="0.12.0-SNAPSHOT"
 
 ENV LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8 \
-    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 \
+    JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 \
     VERSION="${version}" \
     HOME="/opt/zeppelin" \
     ZEPPELIN_HOME="/opt/zeppelin" \