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

Revert "HBASE-23945 Dockerfiles showing hadolint check failures"

Browse Source 
This reverts commit 4205677eb73fd5f09d0ed8d8d957edca4ff4a59f.
This commit is contained in:
Nick Dimiduk 2020-03-07 10:42:04 -08:00
parent 5872758c6b
commit 3e5d3a0ab3
2 changed files with 7 additions and 15 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

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.