This is an automated email from the ASF dual-hosted git repository. wesm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push: new 9fd7357 ARROW-5678: [R][Lint] Fix hadolint docker linting error 9fd7357 is described below commit 9fd7357757bc1dcd1e1c8e4612a2f1bea38ccd04 Author: Wes McKinney <wesm+...@apache.org> AuthorDate: Fri Jun 21 12:44:59 2019 -0500 ARROW-5678: [R][Lint] Fix hadolint docker linting error Author: Wes McKinney <wesm+...@apache.org> Author: Krisztián Szűcs <szucs.kriszt...@gmail.com> Closes #4650 from kszucs/r-hadolint and squashes the following commits: be8e587dc <Wes McKinney> Ignore ruby gem version pinning 1558bc61e <Krisztián Szűcs> fix docker linting error --- .hadolint.yaml | 2 ++ r/Dockerfile | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.hadolint.yaml b/.hadolint.yaml index 33190e8..99ce671 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -19,3 +19,5 @@ ignored: - DL3008 - DL3013 - DL3018 + - DL3015 # Avoid additional packages by specifying `--no-install-recommends` + - DL3028 # Ruby gem version pinning diff --git a/r/Dockerfile b/r/Dockerfile index 7c0b087..63ff3e7 100644 --- a/r/Dockerfile +++ b/r/Dockerfile @@ -27,27 +27,29 @@ ENV DEBIAN_FRONTEND=noninteractive # Build R # [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04 # [2] https://linuxize.com/post/how-to-install-r-on-ubuntu-18-04/#installing-r-packages-from-cran -RUN apt update && \ - apt install -y \ +RUN apt-get update -y && \ + apt-get install -y \ apt-transport-https \ software-properties-common && \ 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 install -y r-base && \ + apt-get install -y r-base && \ # system libs needed by core R packages - apt install -y \ - libgit2-dev \ - libssl-dev && \ + apt-get install -y \ + libgit2-dev \ + libssl-dev && \ # install clang to mirror what was done on Travis - apt install -y \ - clang \ - clang-format \ - clang-tidy && \ + apt-get install -y \ + clang \ + clang-format \ + clang-tidy && \ # R CMD CHECK --as-cran needs pdflatex to build the package manual - apt install -y \ - texlive-latex-base && \ + apt-get install -y \ + texlive-latex-base && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* && \ Rscript -e "install.packages('devtools', repos = 'http://cran.rstudio.com')" && \ Rscript -e "devtools::install_github('romainfrancois/decor')" && \ Rscript -e "install.packages(c( \