add R and python to zeppelin-base

mfelgamal · mfelgamal · commit e1d4b7733523 · 2016-11-03T19:39:04.000+02:00
diff --git a/docs/install/docker.md b/docs/install/docker.md
@@ -43,7 +43,8 @@ You need to [install docker](https://docs.docker.com/engine/installation/) on yo
 * To start Zeppelin, you need to pull the zeppelin release image: 
 ```
 docker pull ${DOCKER_USERNAME}/zeppelin-release:<release-version>
-docker run --rm -it -p 8080:8080 -p 8081:8081 ${DOCKER_USERNAME}/zeppelin-release:<release-version> bash
+
+docker run --rm -it -p 7077:7077 -p 8081:8081 ${DOCKER_USERNAME}/zeppelin-release:<release-version> bash
 ```
 * Then a docker container will start with a Zeppelin release on path :
 `/usr/local/zeppelin/`
@@ -53,5 +54,11 @@ docker run --rm -it -p 8080:8080 -p 8081:8081 ${DOCKER_USERNAME}/zeppelin-releas
 /usr/local/zeppelin/bin/zeppelin-daemon start
 ```
 
+* To Run Zeppelin in daemon mode 
+```
+docker run -d -p 7077:7077 -p 8081:8081 ${DOCKER_USERNAME}/zeppelin-release:<release-version> \
+ bash -c "/usr/local/zeppelin/bin/zeppelin-daemon.sh restart && while true; do sleep 3; done"
+```
+
 * Zeppelin will run at `http://localhost:8080`.
 
diff --git a/scripts/docker/zeppelin-base/Dockerfile b/scripts/docker/zeppelin-base/Dockerfile
@@ -17,9 +17,16 @@
 FROM alpine:3.3
 MAINTAINER Apache Software Foundation <dev@zeppelin.apache.org>
 
-RUN apk add --update bash curl openjdk7-jre wget ca-certificates java-cacerts openssl \
+RUN apk add --update bash curl openjdk7-jre wget ca-certificates python build-base make gcc g++ java-cacerts openssl \
    && rm /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts \
    && ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts \
+   && curl --silent \
+    --location https://github.com/sgerrand/alpine-pkg-R/releases/download/3.3.1-r0/R-3.3.1-r0.apk --output /var/cache/apk/R-3.3.1-r0.apk \
+  && apk add --update --allow-untrusted /var/cache/apk/R-3.3.1-r0.apk \
+  && curl --silent \
+    --location https://github.com/sgerrand/alpine-pkg-R/releases/download/3.3.1-r0/R-dev-3.3.1-r0.apk --output /var/cache/apk/R-dev-3.3.1-r0.apk \
+  && apk add --update --allow-untrusted /var/cache/apk/R-dev-3.3.1-r0.apk \
+  && R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org')" \
    && rm -rf /var/cache/apk/*
 
 RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64
@@ -30,6 +37,6 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk
 ENV PATH $PATH:$JAVA_HOME/bin
 
 # ports for zeppelin
-EXPOSE 8080 8081
+EXPOSE 8080 7077
 
 ENTRYPOINT ["/usr/local/bin/dumb-init"]
