Repository: hadoop
Updated Branches:
  refs/heads/branch-2 33455fa41 -> 07169e25c


HADOOP-12513. Dockerfile lacks initial 'apt-get update'. Contributed by Akihiro 
Suda.

(cherry picked from commit 123b3db743a86aa18e46ec44a08f7b2e7c7f6350)


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

Branch: refs/heads/branch-2
Commit: 07169e25ce5222c2851b6a74c708ef4169630e77
Parents: 33455fa
Author: Tsuyoshi Ozawa <[email protected]>
Authored: Mon Oct 26 23:17:45 2015 +0900
Committer: Tsuyoshi Ozawa <[email protected]>
Committed: Mon Oct 26 23:19:14 2015 +0900

----------------------------------------------------------------------
 dev-support/docker/Dockerfile                   | 7 ++++---
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/07169e25/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index f761f8b..ad253a7 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -24,9 +24,10 @@ 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
+RUN apt-get update && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository -y ppa:webupd8team/java && \
+    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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/07169e25/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 7ac0878..176b50e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -671,6 +671,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12483. Maintain wrapped SASL ordering for postponed IPC responses.
     (Daryn Sharp via yliu)
 
+    HADOOP-12513. Dockerfile lacks initial 'apt-get update'.
+    (Akihiro Suda via ozawa)
+
   OPTIMIZATIONS
 
     HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()

Reply via email to