[hbase] 01/02: HBASE-23945 Dockerfiles showing hadolint check failures

[nd...@apache.org]

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

ndimiduk pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 4205677eb73fd5f09d0ed8d8d957edca4ff4a59f
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Fri Mar 6 09:18:12 2020 -0800

    HBASE-23945 Dockerfiles showing hadolint check failures
    
    Signed-off-by: stack <st...@apache.org>
---
 dev-support/Dockerfile              | 10 +++++++---
 dev-support/hbase_docker/Dockerfile | 12 ++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dev-support/Dockerfile b/dev-support/Dockerfile
index 5d79988..89b7726 100644
--- a/dev-support/Dockerfile
+++ b/dev-support/Dockerfile
@@ -22,8 +22,12 @@
 # dev-support/flaky-tests/flaky-reporting.Jenkinsfile
 FROM ubuntu:18.04
 
-ADD . /hbase/dev-support
+COPY . /hbase/dev-support
 
-RUN apt-get -y update \
-    && apt-get -y install curl python-pip \
+RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install --no-install-recommends \
+      curl=7.58.0-2ubuntu3.8 \
+      python-pip=9.0.1-2.3~ubuntu1.18.04.1 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
     && pip install -r /hbase/dev-support/python-requirements.txt
diff --git a/dev-support/hbase_docker/Dockerfile b/dev-support/hbase_docker/Dockerfile
index 1a5dfa3..c018a30 100644
--- a/dev-support/hbase_docker/Dockerfile
+++ b/dev-support/hbase_docker/Dockerfile
@@ -17,21 +17,25 @@
 FROM ubuntu:14.04
 
 # Install Git, which is missing from the Ubuntu base images.
-RUN apt-get update && apt-get install -y git
+RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
+  && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install --no-install-recommends \
+    git=1:1.9.1-1ubuntu0.10 \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 # Add the dependencies from the hbase_docker folder and delete ones we don't need.
 WORKDIR /root
-ADD . /root
+COPY . /root
 RUN find . -not -name "*tar.gz" -delete
 
 # Install Java.
 RUN mkdir -p /usr/java
-RUN tar xzf *jdk* --strip-components 1 -C /usr/java
+RUN tar xzf ./*jdk* --strip-components 1 -C /usr/java
 ENV JAVA_HOME /usr/java
 
 # Install Maven.
 RUN mkdir -p /usr/local/apache-maven
-RUN tar xzf *maven* --strip-components 1 -C /usr/local/apache-maven
+RUN tar xzf ./*maven* --strip-components 1 -C /usr/local/apache-maven
 ENV MAVEN_HOME /usr/local/apache-maven
 
 # Add Java and Maven to the path.