[zeppelin] branch master updated: [ZEPPELIN-4783] Avoid warning on PUBKEY when apt update cran.rstudio

[mo...@apache.org]

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

moon 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 e43e133  [ZEPPELIN-4783] Avoid warning on PUBKEY when apt update cran.rstudio
e43e133 is described below

commit e43e133e7c7af5125d87dd80c089305c7f783498
Author: Yann PETIT <ya...@saagie.com>
AuthorDate: Wed Apr 29 17:57:54 2020 +0200

    [ZEPPELIN-4783] Avoid warning on PUBKEY when apt update cran.rstudio
    
    ### What is this PR for?
    Solves https://issues.apache.org/jira/browse/ZEPPELIN-4783
    
    ### What type of PR is it?
    Bug Fix
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/ZEPPELIN-4783
    
    ### How should this be tested?
    Run the docker build and see no warning with the new Key.
    Checks that from an inherited docker image we can now apt-get update without warnings and apt-get install succeed also, so the build of he inherited file is OK.
    
    ### Questions:
    * Does the licenses files need update?  No
    * Is there breaking changes for older versions? No
    * Does this needs documentation?  No
    
    Author: Yann PETIT <ya...@saagie.com>
    
    Closes #3755 from finalspy/branch-0.9 and squashes the following commits:
    
    1cde03302 [Yann PETIT] [ZEPPELIN-4783] Avoid warning on PUBKEY when apt update cran.rstudio
    
    (cherry picked from commit f256c4d8207683a111ce552eb7205c981dd92395)
    Signed-off-by: Lee moon soo <mo...@apache.org>
---
 scripts/docker/zeppelin/bin/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/docker/zeppelin/bin/Dockerfile b/scripts/docker/zeppelin/bin/Dockerfile
index 592f61f..6745b46 100644
--- a/scripts/docker/zeppelin/bin/Dockerfile
+++ b/scripts/docker/zeppelin/bin/Dockerfile
@@ -81,8 +81,7 @@ 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 && \
-    gpg --keyserver keyserver.ubuntu.com --recv-key E084DAB9 && \
-    gpg -a --export E084DAB9 | apt-key add - && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 51716619E084DAB9 && \
     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')" && \