[hadoop] branch branch-2-jhung-test updated (9a9a757 -> 9e7e1ca)

[jh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jhung pushed a change to branch branch-2-jhung-test
in repository https://gitbox.apache.org/repos/asf/hadoop.git.


 discard 9a9a757  install openjdk7 too
     new 9e7e1ca  install openjdk7 too

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (9a9a757)
            \
             N -- N -- N   refs/heads/branch-2-jhung-test (9e7e1ca)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dev-support/docker/Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org

[hadoop] 01/01: install openjdk7 too

[jh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jhung pushed a commit to branch branch-2-jhung-test
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 9e7e1caaaecd2f3d6f31698e4823b8b9245b9799
Author: Jonathan Hung <jh...@linkedin.com>
AuthorDate: Thu Jan 31 15:18:19 2019 -0800

    install openjdk7 too
---
 dev-support/docker/Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 23f8006..569e1d3 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -76,9 +76,14 @@ RUN apt-get -q update && apt-get -q install -y \
     zlib1g-dev
 
 #######
-# OpenJDK 8
+# OpenJDK 7 and 8
 #######
 RUN apt-get -q install -y openjdk-8-jdk
+RUN add-apt-repository ppa:openjdk-r/ppa
+RUN apt-get -q update \
+    && apt-get -q install -y --no-install-recommends openjdk-7-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 #######
 # OpenJDK 9


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org