hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject hadoop git commit: HADOOP-11936. Dockerfile references a removed image (aw)
Date Thu, 07 May 2015 18:48:29 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 4e1f2eb39 -> 1886bab0f


HADOOP-11936. Dockerfile references a removed image (aw)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1886bab0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1886bab0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1886bab0

Branch: refs/heads/branch-2
Commit: 1886bab0f159ca77248a9ee90da85385f85e3deb
Parents: 4e1f2eb
Author: Allen Wittenauer <aw@apache.org>
Authored: Thu May 7 11:46:32 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Thu May 7 11:47:20 2015 -0700

----------------------------------------------------------------------
 dev-support/docker/Dockerfile                   | 12 +++++++++++-
 dev-support/docker/hadoop_env_checks.sh         |  0
 hadoop-common-project/hadoop-common/CHANGES.txt |  2 ++
 start-build-env.sh                              |  0
 4 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1886bab0/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 81296dc..f761f8b 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -19,10 +19,20 @@
 # See BUILDING.txt.
 
 # FROM dockerfile/java:openjdk-7-jdk
-FROM dockerfile/java:oracle-java7
+# FROM dockerfile/java:oracle-java7
+FROM ubuntu:trusty
 
 WORKDIR /root
 
+RUN apt-get install -y software-properties-common
+RUN add-apt-repository -y ppa:webupd8team/java
+RUN apt-get 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
+
 # Install dependencies from packages
 RUN apt-get update && apt-get install --no-install-recommends -y \
     git curl ant make maven \

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1886bab0/dev-support/docker/hadoop_env_checks.sh
----------------------------------------------------------------------
diff --git a/dev-support/docker/hadoop_env_checks.sh b/dev-support/docker/hadoop_env_checks.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1886bab0/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5b6c7b3..dc6705e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -168,6 +168,8 @@ Release 2.8.0 - UNRELEASED
     HADOOP-10387. Misspelling of threshold in log4j.properties for tests in
     hadoop-common-project. (Brahma Reddy Battula via aajisaka)
 
+    HADOOP-11936. Dockerfile references a removed image (aw)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1886bab0/start-build-env.sh
----------------------------------------------------------------------
diff --git a/start-build-env.sh b/start-build-env.sh
old mode 100644
new mode 100755


Mime
View raw message