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 aw...@apache.org on 2015/07/30 23:42:36 UTC
hadoop git commit: HADOOP-12298. Move recent yetus docker changes to
the yetus dockerfile (aw)
Repository: hadoop
Updated Branches:
refs/heads/HADOOP-12111 e4c9d5238 -> 8f1f650d8
HADOOP-12298. Move recent yetus docker changes to the yetus dockerfile (aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8f1f650d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8f1f650d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8f1f650d
Branch: refs/heads/HADOOP-12111
Commit: 8f1f650d826cd73aad4c8c209b236e3314fec20c
Parents: e4c9d52
Author: Allen Wittenauer <aw...@apache.org>
Authored: Thu Jul 30 14:42:27 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Thu Jul 30 14:42:27 2015 -0700
----------------------------------------------------------------------
dev-support/docker/Dockerfile | 6 +-----
dev-support/test-patch-docker/Dockerfile-startstub | 8 +++++++-
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f1f650d/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 83341f5..f761f8b 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -44,8 +44,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libjansson-dev \
fuse libfuse-dev \
libcurl4-openssl-dev \
- python python2.7 pylint \
- ruby
+ python python2.7
# Install Forrest
RUN mkdir -p /usr/local/apache-forrest ; \
@@ -64,9 +63,6 @@ ENV FINDBUGS_HOME /opt/findbugs
RUN apt-get install -y cabal-install
RUN cabal update && cabal install shellcheck --global
-# Install rubocop
-RUN gem install rubocop
-
# Fixing the Apache commons / Maven dependency problem under Ubuntu:
# See http://wiki.apache.org/commons/VfsProblems
RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar .
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f1f650d/dev-support/test-patch-docker/Dockerfile-startstub
----------------------------------------------------------------------
diff --git a/dev-support/test-patch-docker/Dockerfile-startstub b/dev-support/test-patch-docker/Dockerfile-startstub
index e534f14..5e5ca78 100644
--- a/dev-support/test-patch-docker/Dockerfile-startstub
+++ b/dev-support/test-patch-docker/Dockerfile-startstub
@@ -32,7 +32,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libjansson-dev \
fuse libfuse-dev \
libcurl4-openssl-dev \
- python python2.7 \
+ python python2.7 pylint \
+ ruby \
openjdk-7-jdk
# Fixing the Apache commons / Maven dependency problem under Ubuntu:
@@ -71,6 +72,11 @@ ENV FINDBUGS_HOME /opt/findbugs
RUN apt-get install -y cabal-install
RUN cabal update && cabal install shellcheck --global
+####
+# Install rubocop
+###
+RUN gem install rubocop
+
#####
# Install JIRA CLI
#####