You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2021/01/17 01:50:43 UTC
[zeppelin] branch branch-0.9 updated (d3688fb -> 9bfe7cb)
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a change to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git.
from d3688fb [ZEPPELIN-5184] Update related to entity name of credentials
new f84a52a [hotfix] update Dockerfile
new 9bfe7cb [hotfix] Fix test failure of SparqlJenaEngineTest
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
scripts/docker/zeppelin/bin/Dockerfile | 22 +++++++++++++---------
.../zeppelin/sparql/SparqlJenaEngineTest.java | 2 +-
2 files changed, 14 insertions(+), 10 deletions(-)
[zeppelin] 01/02: [hotfix] update Dockerfile
Posted by zj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
commit f84a52aa287cf1bc98c840c72f1831329bba6afe
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Tue Dec 29 11:46:13 2020 +0800
[hotfix] update Dockerfile
---
scripts/docker/zeppelin/bin/Dockerfile | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/scripts/docker/zeppelin/bin/Dockerfile b/scripts/docker/zeppelin/bin/Dockerfile
index abc2e12..7eeebdb 100644
--- a/scripts/docker/zeppelin/bin/Dockerfile
+++ b/scripts/docker/zeppelin/bin/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:20.04
+FROM ubuntu:18.04
MAINTAINER Apache Software Foundation <de...@zeppelin.apache.org>
ENV Z_VERSION="0.9.0"
@@ -59,14 +59,16 @@ RUN echo "$LOG_TAG Install miniconda3 related packages" && \
ENV PATH /opt/conda/bin:$PATH
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
+
RUN echo "$LOG_TAG Install python related packages" && \
- sudo apt-get -y install software-properties-common && \
- sudo apt-add-repository universe && \
- sudo apt-get -y update && \
+ apt-get -y install software-properties-common && \
+ apt-add-repository universe && \
+ apt-get -y update && \
apt-get install -y python-dev python-pip && \
apt-get install -y gfortran && \
# numerical/algebra packages
- apt-get install -y libblas-dev libatlas-dev liblapack-dev && \
+ apt-get install -y libblas-dev libatlas-base-dev liblapack-dev && \
# font, image
apt-get install -y libpng-dev libfreetype6-dev libxft-dev && \
# for tkinter
@@ -82,8 +84,8 @@ RUN echo "$LOG_TAG Install python related packages" && \
RUN echo "$LOG_TAG Install R related packages" && \
echo "PATH: $PATH" && \
ls /opt/conda/bin && \
- echo "deb http://cran.rstudio.com/bin/linux/ubuntu xenial/" | tee -a /etc/apt/sources.list && \
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 51716619E084DAB9 && \
+ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 && \
+ add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran35/' && \
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')" && \
@@ -92,9 +94,11 @@ RUN echo "$LOG_TAG Install R related packages" && \
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');IRkernel::installspec()" && \
- R -e "install.packages('shiny', repos = 'https://cloud.r-project.org')" && \
+ R -e "install.packages('shiny', repos = 'https://cloud.r-project.org')"
+
+RUN echo "$LOG_TAG Install R related packages2" && \
# for devtools, Rcpp
- apt-get -y install libcurl4-gnutls-dev libssl-dev && \
+ apt-get -y install libcurl4-openssl-dev libssl-dev && \
R -e "install.packages('devtools', repos='http://cran.us.r-project.org')" && \
R -e "install.packages('Rcpp', repos='http://cran.us.r-project.org')" && \
Rscript -e "library('devtools'); library('Rcpp'); install_github('ramnathv/rCharts')"
[zeppelin] 02/02: [hotfix] Fix test failure of SparqlJenaEngineTest
Posted by zj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
commit 9bfe7cbfb86381d760e4973f63bb626b1571ed6d
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Sun Jan 17 09:49:49 2021 +0800
[hotfix] Fix test failure of SparqlJenaEngineTest
---
.../src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sparql/src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java b/sparql/src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java
index 5a85998..3e46398 100644
--- a/sparql/src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java
+++ b/sparql/src/test/java/org/apache/zeppelin/sparql/SparqlJenaEngineTest.java
@@ -172,7 +172,7 @@ public class SparqlJenaEngineTest {
final InterpreterResult result = interpreter.interpret(query, null);
assertEquals(Code.SUCCESS, result.code());
- final String expected = "?athlete\n<http://dbpedia.org/resource/Cristiano_Ronaldo>\n";
+ final String expected = "?athlete\n<http://dbpedia.org/resource/Category:git Cristiano_Ronaldo>\n";
assertEquals(expected, result.message().get(0).getData());
}