You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2020/03/07 18:41:48 UTC
[hbase] 01/01: Revert "HBASE-23945 Dockerfiles showing hadolint
check failures"
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch revert-1244-23945-hadolint-failures
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 19de6eb31c6b1e1b09b524dadb434aaa9eca1b97
Author: Nick Dimiduk <nd...@gmail.com>
AuthorDate: Sat Mar 7 10:41:34 2020 -0800
Revert "HBASE-23945 Dockerfiles showing hadolint check failures"
This reverts commit c61f95022d0df3fba1be81a4dab3784571652a1f.
---
dev-support/Dockerfile | 10 +++------
dev-support/create-release/hbase-rm/Dockerfile | 30 +++++++++++---------------
dev-support/hbase_docker/Dockerfile | 12 ++++-------
3 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/dev-support/Dockerfile b/dev-support/Dockerfile
index 89b7726..5d79988 100644
--- a/dev-support/Dockerfile
+++ b/dev-support/Dockerfile
@@ -22,12 +22,8 @@
# dev-support/flaky-tests/flaky-reporting.Jenkinsfile
FROM ubuntu:18.04
-COPY . /hbase/dev-support
+ADD . /hbase/dev-support
-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/* \
+RUN apt-get -y update \
+ && apt-get -y install curl python-pip \
&& pip install -r /hbase/dev-support/python-requirements.txt
diff --git a/dev-support/create-release/hbase-rm/Dockerfile b/dev-support/create-release/hbase-rm/Dockerfile
index 91c9c2a..092b418 100644
--- a/dev-support/create-release/hbase-rm/Dockerfile
+++ b/dev-support/create-release/hbase-rm/Dockerfile
@@ -21,28 +21,22 @@
# * Java 8
FROM ubuntu:18.04
+# These arguments are just for reuse and not really meant to be customized.
+ARG APT_INSTALL="apt-get install --no-install-recommends -y"
+
# Install extra needed repos and refresh.
#
# This is all in a single "RUN" command so that if anything changes, "apt update" is run to fetch
# the most current package versions (instead of potentially using old versions cached by docker).
-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 \
- git=1:2.17.1-1ubuntu0.5 \
- gnupg=2.2.4-1ubuntu1.2 \
- libcurl4-openssl-dev=7.58.0-2ubuntu3.8 \
- libxml2-dev=2.9.4+dfsg1-6.1ubuntu1.3 \
- lsof=4.89+dfsg-0.1 \
- maven=3.6.0-1~18.04.1 \
- openjdk-8-jdk=8u242-b08-0ubuntu3~18.04 \
- python-pip=9.0.1-2.3~ubuntu1.18.04.1 \
- subversion=1.9.7-4ubuntu1 \
- wget=1.19.4-1ubuntu2.2 \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/* \
- && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \
- && pip install \
- python-dateutil==2.8.1
+RUN apt-get clean && \
+ apt-get update && \
+ # Install openjdk 8.
+ $APT_INSTALL openjdk-8-jdk && \
+ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java && \
+ # Install build / source control tools
+ $APT_INSTALL curl gnupg python-pip wget git maven subversion lsof \
+ libcurl4-openssl-dev libxml2-dev && \
+ pip install python-dateutil
WORKDIR /opt/hbase-rm/output
diff --git a/dev-support/hbase_docker/Dockerfile b/dev-support/hbase_docker/Dockerfile
index c018a30..1a5dfa3 100644
--- a/dev-support/hbase_docker/Dockerfile
+++ b/dev-support/hbase_docker/Dockerfile
@@ -17,25 +17,21 @@
FROM ubuntu:14.04
# Install Git, which is missing from the Ubuntu base images.
-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/*
+RUN apt-get update && apt-get install -y git
# Add the dependencies from the hbase_docker folder and delete ones we don't need.
WORKDIR /root
-COPY . /root
+ADD . /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.