Repository: hadoop Updated Branches: refs/heads/trunk f9427f176 -> ab5058de8
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/ab5058de Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab5058de Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab5058de Branch: refs/heads/trunk Commit: ab5058de8e8b9b66b24edb238f25e5315b98c496 Parents: f9427f1 Author: Allen Wittenauer <a...@apache.org> Authored: Thu May 7 11:46:32 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Thu May 7 11:46:32 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/ab5058de/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/ab5058de/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/ab5058de/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 8e90a99..ddcd0ba 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -621,6 +621,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/ab5058de/start-build-env.sh ---------------------------------------------------------------------- diff --git a/start-build-env.sh b/start-build-env.sh old mode 100644 new mode 100755
