[ZEPPELIN-2492] Use single Dockerfile for each tag

dev/change_zeppelin_version.sh

@@ -18,8 +18,8 @@
 #
 
 usage() {
-  echo "usage) $0 [Old version] [New version]"
-  echo "   ex. $0 0.7.0-SNAPSHOT 0.7.0"
+  echo "usage) $0 [OLD version] [NEW version]"
+  echo "   ex. $0 0.8.0-SNAPSHOT 0.8.0"
   exit 1
 }
 
@@ -58,6 +58,9 @@ sed -i '' 's/-'"${FROM_VERSION}"'.jar",/-'"${TO_VERSION}"'.jar",/g' zeppelin-exa
 sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version": "'"${TO_VERSION}"'",/g' zeppelin-web/src/app/tabledata/package.json
 sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version": "'"${TO_VERSION}"'",/g' zeppelin-web/src/app/visualization/package.json
 
+# Change version in Dockerfile
+sed -i '' 's/Z_VERSION="'"${FROM_VERSION}"'"/Z_VERSION="'"${TO_VERSION}"'"/g' scripts/docker/zeppelin/bin/Dockerfile
+
 # When preparing new dev version from release tag, doesn't need to change docs version
 if is_dev_version "${FROM_VERSION}" || ! is_dev_version "${TO_VERSION}"; then
   # When prepare new rc for the maintenance release

docs/install/docker.md

@@ -19,7 +19,7 @@ limitations under the License.
 -->
 {% include JB/setup %}
 
-# Apache Zeppelin Releases Docker Images
+# Docker Image for Apache Zeppelin Releases 
 
 <div id="toc"></div>
 
@@ -34,28 +34,28 @@ You need to [install docker](https://docs.docker.com/engine/installation/) on yo
 ### Running docker image
 
 ```
-docker run -p 8080:8080 --name zeppelin zeppelin:<release-version> 
+docker run -p 8080:8080 --rm --name zeppelin apache/zeppelin:<release-version> 
 ```
 
 * Zeppelin will run at `http://localhost:8080`.
 
 If you want to specify `logs` and `notebook` dir, 
 
 ```
-docker run -p 8080:8080 \
+docker run -p 8080:8080 --rm \
 -v $PWD/logs:/logs \
 -v $PWD/notebook:/notebook \
 -e ZEPPELIN_LOG_DIR='/logs' \
 -e ZEPPELIN_NOTEBOOK_DIR='/notebook' \
---name zeppelin zeppelin:<release-version> # e.g '0.7.1'
+--name zeppelin apache/zeppelin:<release-version> # e.g '0.7.1'
 ```
 
 ### Building dockerfile locally
 
 ```
 cd $ZEPPELIN_HOME
-cd scripts/docker/zeppelin
+cd scripts/docker/zeppelin/bin
 
-./create-dockerfile.sh <release-version>   # e.g '0.7.1'
+docker build -t my-zeppelin:my-tag ./
 ```
 

scripts/docker/zeppelin/base/Dockerfile → scripts/docker/zeppelin/bin/Dockerfile

@@ -16,7 +16,10 @@
 FROM ubuntu:16.04
 MAINTAINER Apache Software Foundation <[email protected]>
 
-ENV LOG_TAG="[ZEPPELIN_BASE]:" \
+# `Z_VERSION` will be updated by `dev/change_zeppelin_version.sh`
+ENV Z_VERSION="0.8.0-SNAPSHOT"
+ENV LOG_TAG="[ZEPPELIN_${Z_VERSION}]:" \
+    Z_HOME="/zeppelin" \
     LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8
 
@@ -86,5 +89,18 @@ RUN echo "$LOG_TAG Install R related packages" && \
     R -e "install.packages('Rcpp', repos='http://cran.us.r-project.org')" && \
     Rscript -e "library('devtools'); library('Rcpp'); install_github('ramnathv/rCharts')"
 
+RUN echo "$LOG_TAG Download Zeppelin binary" && \
+    wget -O /tmp/zeppelin-${Z_VERSION}-bin-all.tgz http://archive.apache.org/dist/zeppelin/zeppelin-${Z_VERSION}/zeppelin-${Z_VERSION}-bin-all.tgz && \
+    tar -zxvf /tmp/zeppelin-${Z_VERSION}-bin-all.tgz && \
+    rm -rf /tmp/zeppelin-${Z_VERSION}-bin-all.tgz && \
+    mv /zeppelin-${Z_VERSION}-bin-all ${Z_HOME}
+
+RUN echo "$LOG_TAG Cleanup" && \
+    apt-get autoclean && \
+    apt-get clean
+
+EXPOSE 8080
+
 ENTRYPOINT [ "/usr/bin/tini", "--" ]
-CMD [ "/bin/bash" ]
+WORKDIR ${Z_HOME}
+CMD ["bin/zeppelin.sh"]