Update version 0.11.0-incubating.

Author: shimamoto

Dockerfile

@@ -1,9 +1,10 @@
 FROM ubuntu
 MAINTAINER shimamoto
 
-ENV PIO_VERSION 0.11.0-v1-SNAPSHOT
-ENV SPARK_VERSION 1.6.3
-ENV ELASTICSEARCH_VERSION 1.7.6
+ENV PIO_VERSION 0.11.0-incubating
+ENV SPARK_VERSION 2.1.0
+ENV HADOOP_VERSION hadoop2.7
+ENV ELASTICSEARCH_VERSION 5.3.1
 ENV HBASE_VERSION 1.0.0
 
 ENV PIO_HOME /PredictionIO-${PIO_VERSION}
@@ -15,21 +16,23 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN cd / \
-    && git clone https://github.com/jpioug/incubator-predictionio.git \
-    && cd incubator-predictionio \
-    && ./make-distribution.sh
+RUN curl -O http://mirror.nexcess.net/apache/incubator/predictionio/${PIO_VERSION}/apache-predictionio-${PIO_VERSION}.tar.gz \
+    && mkdir /apache-predictionio-${PIO_VERSION} \
+    && tar -xvzf apache-predictionio-${PIO_VERSION}.tar.gz -C /apache-predictionio-${PIO_VERSION} \
+    && rm apache-predictionio-${PIO_VERSION}.tar.gz \
+    && cd apache-predictionio-${PIO_VERSION} \
+    && ./make-distribution.sh -Dscala.version=2.11.8 -Dspark.version=${SPARK_VERSION} -Delasticsearch.version=${ELASTICSEARCH_VERSION}
 
-RUN tar zxvf /incubator-predictionio/PredictionIO-${PIO_VERSION}.tar.gz -C /
-RUN rm -r /incubator-predictionio
-RUN mkdir /${PIO_HOME}/vendors
+RUN tar zxvf /apache-predictionio-${PIO_VERSION}/PredictionIO-${PIO_VERSION}.tar.gz -C /
+RUN rm -r /apache-predictionio-${PIO_VERSION}
+RUN mkdir ${PIO_HOME}/vendors
 COPY files/pio-env.sh ${PIO_HOME}/conf/pio-env.sh
 
-RUN curl -O http://d3kbcqa49mib13.cloudfront.net/spark-${SPARK_VERSION}-bin-hadoop2.6.tgz \
-    && tar -xvzf spark-${SPARK_VERSION}-bin-hadoop2.6.tgz -C ${PIO_HOME}/vendors \
-    && rm spark-${SPARK_VERSION}-bin-hadoop2.6.tgz
+RUN curl -O http://d3kbcqa49mib13.cloudfront.net/spark-${SPARK_VERSION}-bin-${HADOOP_VERSION}.tgz \
+    && tar -xvzf spark-${SPARK_VERSION}-bin-${HADOOP_VERSION}.tgz -C ${PIO_HOME}/vendors \
+    && rm spark-${SPARK_VERSION}-bin-${HADOOP_VERSION}.tgz
 
-RUN curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz \
+RUN curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz \
     && tar -xvzf elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz -C ${PIO_HOME}/vendors \
     && rm elasticsearch-${ELASTICSEARCH_VERSION}.tar.gz \
     && echo 'cluster.name: predictionio' >> ${PIO_HOME}/vendors/elasticsearch-${ELASTICSEARCH_VERSION}/config/elasticsearch.yml \
@@ -41,3 +44,7 @@ RUN curl -O http://archive.apache.org/dist/hbase/hbase-${HBASE_VERSION}/hbase-${
 COPY files/hbase-site.xml ${PIO_HOME}/vendors/hbase-${HBASE_VERSION}/conf/hbase-site.xml
 RUN sed -i "s|VAR_PIO_HOME|${PIO_HOME}|" ${PIO_HOME}/vendors/hbase-${HBASE_VERSION}/conf/hbase-site.xml \
     && sed -i "s|VAR_HBASE_VERSION|${HBASE_VERSION}|" ${PIO_HOME}/vendors/hbase-${HBASE_VERSION}/conf/hbase-site.xml
+
+RUN groupadd -r pio --gid=999 \
+    && useradd -r -g pio --uid=999 -m pio \
+    && chown -R pio:pio ${PIO_HOME}

README.md

@@ -2,7 +2,7 @@
 Docker container for PredictionIO-based machine learning services
 
 This container uses Apache Spark, HBase and Elasticsearch.
-The PredictionIO version is [jpioug](https://github.com/jpioug) version.
+The PredictionIO version is 0.11.0-incubating.
 
 ### Use it interactively for development:
 1. First, build docker image from local Dockerfile: cd to the path containing the Dockerfile, then:
@@ -16,6 +16,7 @@ $ docker run -p 8000:8000 --name predictionio_instance -it predictionio /bin/bas
 
 2. Then in docker container, start all services and check they are started
 ```Bash
-$ pio-start-all
-$ jps -l
+root@...:/# su pio
+pio@...:/$ pio-start-all
+pio@...:/$ jps -l
 ```

files/pio-env.sh

@@ -4,7 +4,7 @@ PIO_FS_BASEDIR=${HOME}/.pio_store
 PIO_FS_ENGINESDIR=${PIO_FS_BASEDIR}/engines
 PIO_FS_TMPDIR=${PIO_FS_BASEDIR}/tmp
 
-SPARK_HOME=${PIO_HOME}/vendors/spark-${SPARK_VERSION}-bin-hadoop2.6
+SPARK_HOME=${PIO_HOME}/vendors/spark-${SPARK_VERSION}-bin-${HADOOP_VERSION}
 
 HBASE_CONF_DIR=${PIO_HOME}/vendors/hbase-${HBASE_VERSION}/conf
 
@@ -18,7 +18,7 @@ PIO_STORAGE_REPOSITORIES_MODELDATA_SOURCE=LOCALFS
 PIO_STORAGE_SOURCES_ELASTICSEARCH_TYPE=elasticsearch
 PIO_STORAGE_SOURCES_ELASTICSEARCH_CLUSTERNAME=predictionio
 PIO_STORAGE_SOURCES_ELASTICSEARCH_HOSTS=localhost
-PIO_STORAGE_SOURCES_ELASTICSEARCH_PORTS=9300
+PIO_STORAGE_SOURCES_ELASTICSEARCH_PORTS=9200
 PIO_STORAGE_SOURCES_ELASTICSEARCH_HOME=${PIO_HOME}/vendors/elasticsearch-${ELASTICSEARCH_VERSION}
 PIO_STORAGE_SOURCES_LOCALFS_TYPE=localfs
 PIO_STORAGE_SOURCES_LOCALFS_PATH=${PIO_FS_BASEDIR}/models