Repository: nutch Updated Branches: refs/heads/2.x e312d5a83 -> dcde8effd
NUTCH-2260 JAVA_HOME and hbase-common dependency absent from hbase Docker image Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/5622ce18 Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/5622ce18 Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/5622ce18 Branch: refs/heads/2.x Commit: 5622ce18cf30da0c9db79528f295095ebf544d62 Parents: e312d5a Author: Lewis John McGibbney <[email protected]> Authored: Sun May 15 16:15:04 2016 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Sun May 15 16:15:04 2016 -0700 ---------------------------------------------------------------------- docker/hbase/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/5622ce18/docker/hbase/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/hbase/Dockerfile b/docker/hbase/Dockerfile index 9b889b5..8bf4822 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 <dependency org="org.apache.hbase" name="hbase-common" rev="0.98.8-hadoop2" conf="*->default" />' $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
