You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2016/04/28 20:02:18 UTC
[34/50] [abbrv] hadoop git commit: HADOOP-13067. cleanup the
dockerfile
HADOOP-13067. cleanup the dockerfile
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf2ee45f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf2ee45f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf2ee45f
Branch: refs/heads/YARN-3368
Commit: cf2ee45f71f3326c4b5b3367ef534c0277392fc1
Parents: 6f26b66
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed Apr 27 19:35:51 2016 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Thu Apr 28 10:03:45 2016 -0700
----------------------------------------------------------------------
dev-support/bin/create-release | 4 ++--
dev-support/docker/Dockerfile | 45 +++++++++++++++++++++++++------------
2 files changed, 33 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf2ee45f/dev-support/bin/create-release
----------------------------------------------------------------------
diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index 22961f6..5ea47cd 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -266,7 +266,7 @@ function stopgpgagent
function usage
{
echo "--artifactsdir=[path] Path to use to store release bits"
- echo "--asfrelease Make an ASF release"
+ echo "--asfrelease Make an ASF release"
echo "--docker Use Hadoop's Dockerfile for guaranteed environment"
echo "--dockercache Use a Docker-private maven cache"
echo "--logdir=[path] Path to store logs"
@@ -620,4 +620,4 @@ if [[ $? == 0 ]]; then
run ls -1 "${ARTIFACTS_DIR}"
echo
-fi
\ No newline at end of file
+fi
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf2ee45f/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 1462fea..eba7df7 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -23,10 +23,13 @@ FROM ubuntu:trusty
WORKDIR /root
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_TERSE true
+
######
# Install common dependencies from packages
######
-RUN apt-get update && apt-get install --no-install-recommends -y \
+RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
ant \
build-essential \
bzip2 \
@@ -56,7 +59,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
protobuf-c-compiler \
python \
python2.7 \
- pylint \
+ python-pip \
snappy \
zlib1g-dev
@@ -67,32 +70,36 @@ RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar .
######
# Install ISA-L library
######
-RUN curl -L http://http.us.debian.org/debian/pool/main/libi/libisal/libisal2_2.15.0-2_amd64.deb \
+RUN curl -s -S -L \
+ http://http.us.debian.org/debian/pool/main/libi/libisal/libisal2_2.15.0-2_amd64.deb \
-o /opt/libisal2_2.15.0-2_amd64.deb && \
dpkg -i /opt/libisal2_2.15.0-2_amd64.deb
-
#######
# Oracle Java
#######
-RUN apt-get install -y software-properties-common
+RUN echo "dot_style = mega" > "/root/.wgetrc"
+RUN echo "quiet = on" >> "/root/.wgetrc"
+
+RUN apt-get -q install --no-install-recommends -y software-properties-common
RUN add-apt-repository -y ppa:webupd8team/java
-RUN apt-get update
+RUN apt-get -q update
# Auto-accept the Oracle JDK license
RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-RUN apt-get install -y oracle-java7-installer
+RUN apt-get -q install --no-install-recommends -y oracle-java7-installer
# Auto-accept the Oracle JDK license
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-RUN apt-get install -y oracle-java8-installer
+RUN apt-get -q install --no-install-recommends -y oracle-java8-installer
######
# Install findbugs
######
RUN mkdir -p /opt/findbugs && \
- curl -L https://sourceforge.net/projects/findbugs/files/findbugs/3.0.1/findbugs-noUpdateChecks-3.0.1.tar.gz/download \
+ curl -L -s -S \
+ https://sourceforge.net/projects/findbugs/files/findbugs/3.0.1/findbugs-noUpdateChecks-3.0.1.tar.gz/download \
-o /opt/findbugs.tar.gz && \
tar xzf /opt/findbugs.tar.gz --strip-components 1 -C /opt/findbugs
ENV FINDBUGS_HOME /opt/findbugs
@@ -100,15 +107,25 @@ ENV FINDBUGS_HOME /opt/findbugs
####
# Install shellcheck
####
-RUN apt-get install -y cabal-install
-RUN cabal update && cabal install shellcheck --global
+RUN apt-get -q install -y cabal-install
+RUN mkdir /root/.cabal
+RUN echo "remote-repo: hackage.fpcomplete.com:http://hackage.fpcomplete.com/" >> /root/.cabal/config
+#RUN echo "remote-repo: hackage.haskell.org:http://hackage.haskell.org/" > /root/.cabal/config
+RUN echo "remote-repo-cache: /root/.cabal/packages" >> /root/.cabal/config
+RUN cabal update
+RUN cabal install shellcheck --global
####
# Install bats
####
RUN add-apt-repository -y ppa:duggan/bats
-RUN apt-get update
-RUN apt-get install -y bats
+RUN apt-get -q update
+RUN apt-get -q install --no-install-recommends -y bats
+
+####
+# Install pylint
+####
+RUN pip install pylint
###
# Avoid out of memory errors in builds
@@ -125,7 +142,7 @@ ENV MAVEN_OPTS -Xms256m -Xmx512m
# Install Forrest (for Apache Hadoop website)
###
RUN mkdir -p /usr/local/apache-forrest ; \
- curl -O http://archive.apache.org/dist/forrest/0.8/apache-forrest-0.8.tar.gz ; \
+ curl -s -S -O http://archive.apache.org/dist/forrest/0.8/apache-forrest-0.8.tar.gz ; \
tar xzf *forrest* --strip-components 1 -C /usr/local/apache-forrest ; \
echo 'forrest.home=/usr/local/apache-forrest' > build.properties