From 5622ce18cf30da0c9db79528f295095ebf544d62 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Sun, 15 May 2016 16:15:04 -0700 Subject: [PATCH 1/3] NUTCH-2260 JAVA_HOME and hbase-common dependency absent from hbase Docker image --- docker/hbase/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/hbase/Dockerfile b/docker/hbase/Dockerfile index 9b889b5c6d..8bf4822b19 100644 --- a/docker/hbase/Dockerfile +++ b/docker/hbase/Dockerfile @@ -27,7 +27,7 @@ RUN add-apt-repository -y multiverse && \ add-apt-repository -y ppa:webupd8team/java && \ apt-get update && apt-get upgrade -y -# Install latest Oracle Java from PPA +# Install Oracle Java from PPA RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ apt-get install -y oracle-java7-installer oracle-java7-set-default @@ -94,11 +94,13 @@ RUN mv /tmp/hadoop-etc/* /opt/hadoop/etc/hadoop RUN mv /tmp/hbase-etc/* /opt/hbase/conf/ RUN mv /tmp/nutch-etc/* /opt/apache-nutch-2.x/conf/ - +ENV JAVA_HOME /usr ENV NUTCH_ROOT /opt/apache-nutch-2.x -RUN echo 'gora.datastore.default=org.apache.gora.hbase.store.HBaseStore' >> /opt/apache-nutch-2.x/conf/gora.properties +RUN echo 'gora.datastore.default=org.apache.gora.hbase.store.HBaseStore' >> $NUTCH_ROOT/conf/gora.properties RUN vim -c 'g/name="gora-hbase"/+1d' -c 'x' $NUTCH_ROOT/ivy/ivy.xml RUN vim -c 'g/name="gora-hbase"/-1d' -c 'x' $NUTCH_ROOT/ivy/ivy.xml +RUN sed -e '35 i ' $NUTCH_ROOT/ivy/ivy.xml > $NUTCH_ROOT/ivy/ivy.xml.tmp && mv $NUTCH_ROOT/ivy/ivy.xml.tmp $NUTCH_ROOT/ivy/ivy.xml + RUN cd $NUTCH_ROOT && ant runtime RUN ln -s /opt/apache-nutch-2.x/runtime/local /opt/nutch && \ mkdir -p /opt/nutch/logs && chown -R hduser:hadoop /opt/nutch/logs From 4bb810c3a385471955dfccf172faa3845ce0b524 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Mon, 16 May 2016 12:33:23 -0700 Subject: [PATCH 2/3] NUTCH-2260 JAVA_HOME and hbase-common dependency absent from hbase Docker image --- docker/hbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/hbase/Dockerfile b/docker/hbase/Dockerfile index 8bf4822b19..8055a15c5b 100644 --- a/docker/hbase/Dockerfile +++ b/docker/hbase/Dockerfile @@ -94,7 +94,7 @@ RUN mv /tmp/hadoop-etc/* /opt/hadoop/etc/hadoop RUN mv /tmp/hbase-etc/* /opt/hbase/conf/ RUN mv /tmp/nutch-etc/* /opt/apache-nutch-2.x/conf/ -ENV JAVA_HOME /usr +ENV JAVA_HOME /usr/lib/jvm/java-7-oracle ENV NUTCH_ROOT /opt/apache-nutch-2.x RUN echo 'gora.datastore.default=org.apache.gora.hbase.store.HBaseStore' >> $NUTCH_ROOT/conf/gora.properties RUN vim -c 'g/name="gora-hbase"/+1d' -c 'x' $NUTCH_ROOT/ivy/ivy.xml From dcde8effd0f7539c0cdeef2aeb25c7f95cb76a0a Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Mon, 16 May 2016 15:51:24 -0700 Subject: [PATCH 3/3] NUTCH-2260 JAVA_HOME and hbase-common dependency absent from hbase Docker image --- docker/hbase/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/hbase/Dockerfile b/docker/hbase/Dockerfile index 8055a15c5b..d0f8d7856c 100644 --- a/docker/hbase/Dockerfile +++ b/docker/hbase/Dockerfile @@ -94,8 +94,8 @@ RUN mv /tmp/hadoop-etc/* /opt/hadoop/etc/hadoop RUN mv /tmp/hbase-etc/* /opt/hbase/conf/ RUN mv /tmp/nutch-etc/* /opt/apache-nutch-2.x/conf/ -ENV JAVA_HOME /usr/lib/jvm/java-7-oracle -ENV NUTCH_ROOT /opt/apache-nutch-2.x +ENV JAVA_HOME="/usr/lib/jvm/java-7-oracle" \ + NUTCH_ROOT="/opt/apache-nutch-2.x" RUN echo 'gora.datastore.default=org.apache.gora.hbase.store.HBaseStore' >> $NUTCH_ROOT/conf/gora.properties RUN vim -c 'g/name="gora-hbase"/+1d' -c 'x' $NUTCH_ROOT/ivy/ivy.xml RUN vim -c 'g/name="gora-hbase"/-1d' -c 'x' $NUTCH_ROOT/ivy/ivy.xml