diff --git a/dev/create_release.sh b/dev/create_release.sh index b1ce218c46..6fa50fcbce 100755 --- a/dev/create_release.sh +++ b/dev/create_release.sh @@ -43,7 +43,12 @@ done RELEASE_VERSION="$1" GIT_TAG="$2" +function build_docker_base() { + # build base image + docker build -t ${DOCKER_USERNAME}/zeppelin-base:latest "${WORKING_DIR}/zeppelin/scripts/docker/zeppelin-base" +} function build_docker_image() { + # build release image echo "FROM ${DOCKER_USERNAME}/zeppelin-base:latest RUN mkdir /usr/local/zeppelin/ ADD zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME} /usr/local/zeppelin/" > "Dockerfile" @@ -117,6 +122,7 @@ function make_binary_release() { git_clone make_source_package +build_docker_base make_binary_release all "-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr -Pscala-2.11" make_binary_release netinst "-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr -Pscala-2.11 -pl !alluxio,!angular,!cassandra,!elasticsearch,!file,!flink,!hbase,!ignite,!jdbc,!kylin,!lens,!livy,!markdown,!postgresql,!python,!shell,!bigquery" diff --git a/dev/publish_release.sh b/dev/publish_release.sh index f41f2641be..adc9a91bac 100755 --- a/dev/publish_release.sh +++ b/dev/publish_release.sh @@ -68,9 +68,11 @@ function curl_error() { } function publish_to_dockerhub() { - # publish image + # publish images docker login --username="${DOCKER_USERNAME}" --password="${DOCKER_PASSWORD}" --email="${DOCKER_EMAIL}" + docker push ${DOCKER_USERNAME}/zeppelin-base:latest docker push ${DOCKER_USERNAME}/zeppelin-release:"${RELEASE_VERSION}" + } function publish_to_maven() { diff --git a/scripts/docker/zeppelin-base/Dockerfile b/scripts/docker/zeppelin-base/Dockerfile new file mode 100644 index 0000000000..37adc80c85 --- /dev/null +++ b/scripts/docker/zeppelin-base/Dockerfile @@ -0,0 +1,16 @@ +FROM alpine:3.3 +MAINTAINER Mahmoud Elgamal + +RUN apk add --update bash curl openjdk7-jre wget ca-certificates openssl && 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 +RUN chmod +x /usr/local/bin/dumb-init + +# set jave environment variable +ENV JAVA_HOME /usr/lib/jvm/java-1.7-openjdk +ENV PATH $PATH:$JAVA_HOME/bin + +# ports for zeppelin +EXPOSE 8080 8081 + +ENTRYPOINT ["/usr/local/bin/dumb-init"]