This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
commit 4191655d5678e30d3d96cc86c54fd2d2281ca39c
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Sat Mar 28 00:16:37 2020 +0800
[hotfix] fix Dockerfile for 0.9.0-preview1
---
scripts/docker/zeppelin/bin/Dockerfile | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/scripts/docker/zeppelin/bin/Dockerfile
b/scripts/docker/zeppelin/bin/Dockerfile
index ae7e63e..8950f30 100644
--- a/scripts/docker/zeppelin/bin/Dockerfile
+++ b/scripts/docker/zeppelin/bin/Dockerfile
@@ -16,8 +16,7 @@
FROM ubuntu:16.04
MAINTAINER Apache Software Foundation <d...@zeppelin.apache.org>
-# `Z_VERSION` will be updated by `dev/change_zeppelin_version.sh`
-ENV Z_VERSION="0.9.0-SNAPSHOT"
+ENV Z_VERSION="0.9.0-preview1"
ENV LOG_TAG="[ZEPPELIN_${Z_VERSION}]:" \
Z_HOME="/zeppelin" \
@@ -57,6 +56,7 @@ RUN echo "$LOG_TAG Install miniconda3 related packages" && \
wget --quiet
https://repo.continuum.io/miniconda/Miniconda3-4.6.14-Linux-x86_64.sh -O
~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh
+
ENV PATH /opt/conda/bin:$PATH
RUN echo "$LOG_TAG Install python related packages" && \
@@ -69,22 +69,29 @@ RUN echo "$LOG_TAG Install python related packages" && \
apt-get install -y libpng-dev libfreetype6-dev libxft-dev && \
# for tkinter
apt-get install -y python-tk libxml2-dev libxslt-dev zlib1g-dev && \
+ hash -r && \
+ conda config --set always_yes yes --set changeps1 no && \
+ conda update -q conda && \
+ conda info -a && \
+ conda config --add channels conda-forge && \
pip install -q pycodestyle==2.5.0 && \
- pip install -q numpy==1.17.3 pandas==0.25.0 scipy==1.3.1 grpcio==1.19.0
bkzep==0.6.1 hvplot==0.5.2 protobuf==3.10.0 && \
- pandasql==0.7.3 ipython==7.8.0 matplotlib==3.0.3 ipykernel==5.1.2
jupyter_client==5.3.4 bokeh==1.3.4 pycodestyle==2.5.0 apache_beam==2.15.0
+ pip install -q numpy==1.17.3 pandas==0.25.0 scipy==1.3.1 grpcio==1.19.0
bkzep==0.6.1 hvplot==0.5.2 protobuf==3.10.0 pandasql==0.7.3 ipython==7.8.0
matplotlib==3.0.3 ipykernel==5.1.2 jupyter_client==5.3.4 bokeh==1.3.4
panel==0.6.0 holoviews==1.12.3 pycodestyle==2.5.0 apache_beam==2.15.0
RUN echo "$LOG_TAG Install R related packages" && \
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys
E298A3A825C0D65DFD57CBB651716619E084DAB9 && \
- add-apt-repository 'deb [arch=amd64,i386]
https://cran.rstudio.com/bin/linux/ubuntu xenial/' && \
+ echo "PATH: $PATH" && \
+ ls /opt/conda/bin && \
+ echo "deb http://cran.rstudio.com/bin/linux/ubuntu xenial/" | tee -a
/etc/apt/sources.list && \
+ gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9 && \
+ gpg -a --export E084DAB9 | apt-key add - && \
apt-get -y update && \
apt-get -y --allow-unauthenticated install r-base r-base-dev && \
- R -e "install.packages('evaluate', repos = 'https://cloud.r-project.org',
lib='~/R')" && \
+ R -e "install.packages('evaluate', repos = 'https://cloud.r-project.org')"
&& \
R -e "install.packages('knitr', repos='http://cran.us.r-project.org')" && \
R -e "install.packages('ggplot2', repos='http://cran.us.r-project.org')"
&& \
R -e "install.packages('googleVis', repos='http://cran.us.r-project.org')"
&& \
R -e "install.packages('data.table',
repos='http://cran.us.r-project.org')" && \
- R -e "install.packages('IRkernel', repos = 'https://cloud.r-project.org',
lib='~/R');IRkernel::installspec()" && \
- R -e "install.packages('shiny', repos = 'https://cloud.r-project.org',
lib='~/R')" && \
+ R -e "install.packages('IRkernel', repos =
'https://cloud.r-project.org');IRkernel::installspec()" && \
+ R -e "install.packages('shiny', repos = 'https://cloud.r-project.org')" &&
\
# for devtools, Rcpp
apt-get -y install libcurl4-gnutls-dev libssl-dev && \
R -e "install.packages('devtools', repos='http://cran.us.r-project.org')"
&& \
