Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-23945 Dockerfiles showing hadolint check failures" 

This reverts commit c61f95022d.
This commit is contained in:
Nick Dimiduk 2020-03-07 10:41:34 -08:00
parent 819965a35a
commit 1f77b1ffa5
3 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev-support/Dockerfile
View File

@ -22,12 +22,8 @@
# dev-support/flaky-tests/flaky-reporting.Jenkinsfile # dev-support/flaky-tests/flaky-reporting.Jenkinsfile
FROM ubuntu:18.04 FROM ubuntu:18.04
COPY . /hbase/dev-support ADD . /hbase/dev-support
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \ RUN apt-get -y update \
&& DEBIAN_FRONTEND=noninteractive apt-get -qq -y install --no-install-recommends \ && apt-get -y install curl python-pip \
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 && pip install -r /hbase/dev-support/python-requirements.txt

30
dev-support/create-release/hbase-rm/Dockerfile
View File

@ -21,28 +21,22 @@
# * Java 8 # * Java 8
FROM ubuntu:18.04 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. # 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 # 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). # the most current package versions (instead of potentially using old versions cached by docker).
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \ RUN apt-get clean && \
&& DEBIAN_FRONTEND=noninteractive apt-get -qq -y install --no-install-recommends \ apt-get update && \
curl=7.58.0-2ubuntu3.8 \ # Install openjdk 8.
git=1:2.17.1-1ubuntu0.5 \ $APT_INSTALL openjdk-8-jdk && \
gnupg=2.2.4-1ubuntu1.2 \ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java && \
libcurl4-openssl-dev=7.58.0-2ubuntu3.8 \ # Install build / source control tools
libxml2-dev=2.9.4+dfsg1-6.1ubuntu1.3 \ $APT_INSTALL curl gnupg python-pip wget git maven subversion lsof \
lsof=4.89+dfsg-0.1 \ libcurl4-openssl-dev libxml2-dev && \
maven=3.6.0-1~18.04.1 \ pip install python-dateutil
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
WORKDIR /opt/hbase-rm/output WORKDIR /opt/hbase-rm/output

12
dev-support/hbase_docker/Dockerfile
View File

@ -17,25 +17,21 @@
FROM ubuntu:14.04 FROM ubuntu:14.04
# Install Git, which is missing from the Ubuntu base images. # Install Git, which is missing from the Ubuntu base images.
RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \ RUN apt-get update && apt-get install -y git
&& 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. # Add the dependencies from the hbase_docker folder and delete ones we don't need.
WORKDIR /root WORKDIR /root
COPY . /root ADD . /root
RUN find . -not -name "*tar.gz" -delete RUN find . -not -name "*tar.gz" -delete
# Install Java. # Install Java.
RUN mkdir -p /usr/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 ENV JAVA_HOME /usr/java
# Install Maven. # Install Maven.
RUN mkdir -p /usr/local/apache-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 ENV MAVEN_HOME /usr/local/apache-maven
# Add Java and Maven to the path. # Add Java and Maven to the path.