You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2017/01/21 08:10:32 UTC

zeppelin git commit: [BUILD] Remove docker build from release script

Repository: zeppelin
Updated Branches:
  refs/heads/master 638e4c2f5 -> 53f8fa167


[BUILD] Remove docker build from release script

### What is this PR for?
Removing docker build and push from release script.
Docker managed by community will be supported sooner or later through https://hub.docker.com/r/apache/ or official docker hub repository, and either way doesn't need push from release script.

### What type of PR is it?
Build

### What is the Jira issue?

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: Mina Lee <mi...@apache.org>

Closes #1926 from minahlee/remove_docker_build and squashes the following commits:

6ea789e [Mina Lee] Publish beam interpreter in maven central repo
3a9b64e [Mina Lee] Remove docker build


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/53f8fa16
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/53f8fa16
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/53f8fa16

Branch: refs/heads/master
Commit: 53f8fa167b7ef95495588940ae87cabd8a377321
Parents: 638e4c2
Author: Mina Lee <mi...@apache.org>
Authored: Thu Jan 19 16:28:30 2017 +0900
Committer: Mina Lee <mi...@apache.org>
Committed: Sat Jan 21 17:10:26 2017 +0900

----------------------------------------------------------------------
 dev/create_release.sh  | 20 +-------------------
 dev/publish_release.sh | 15 +++------------
 2 files changed, 4 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/53f8fa16/dev/create_release.sh
----------------------------------------------------------------------
diff --git a/dev/create_release.sh b/dev/create_release.sh
index 873bb10..cac6a75 100755
--- a/dev/create_release.sh
+++ b/dev/create_release.sh
@@ -33,7 +33,7 @@ if [[ $# -ne 2 ]]; then
   usage
 fi
 
-for var in GPG_PASSPHRASE DOCKER_USERNAME; do
+for var in GPG_PASSPHRASE; do
   if [[ -z "${!var}" ]]; then
     echo "You need ${var} variable set"
     exit 1
@@ -44,18 +44,6 @@ RELEASE_VERSION="$1"
 GIT_TAG="$2"
 SCALA_VERSION="2.11"
 
-function build_docker_base() {
-  # build base image
-  docker build -t ${DOCKER_USERNAME}/zeppelin-base:latest "${BASEDIR}/../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"
-  docker build -t ${DOCKER_USERNAME}/zeppelin-release:"${RELEASE_VERSION}" .
-}
-
 function make_source_package() {
   # create source package
   cd ${WORKING_DIR}
@@ -112,16 +100,10 @@ function make_binary_release() {
   mv "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.md5" "${WORKING_DIR}/"
   mv "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}.tgz.sha512" "${WORKING_DIR}/"
 
-  # build docker image if binary_release_name 'all'
-  if [[ $1 = "all" ]]; then
-    build_docker_image
-  fi
-  
   # clean up build dir
   rm -rf "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
 }
 
-build_docker_base
 git_clone
 make_source_package
 make_binary_release all "-Pspark-2.1 -Phadoop-2.6 -Pyarn -Ppyspark -Psparkr -Pscala-${SCALA_VERSION}"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/53f8fa16/dev/publish_release.sh
----------------------------------------------------------------------
diff --git a/dev/publish_release.sh b/dev/publish_release.sh
index a2acc98..cf3de10 100755
--- a/dev/publish_release.sh
+++ b/dev/publish_release.sh
@@ -30,7 +30,7 @@ if [[ $# -ne 2 ]]; then
   usage
 fi
 
-for var in GPG_PASSPHRASE ASF_USERID ASF_PASSWORD DOCKER_USERNAME DOCKER_PASSWORD DOCKER_EMAIL; do
+for var in GPG_PASSPHRASE ASF_USERID ASF_PASSWORD; do
   if [[ -z "${!var}" ]]; then
     echo "You need ${var} variable set"
     exit 1
@@ -67,14 +67,6 @@ function curl_error() {
   fi
 }
 
-function publish_to_dockerhub() {
-  # 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() {
   cd "${WORKING_DIR}/zeppelin"
 
@@ -102,9 +94,9 @@ function publish_to_maven() {
 
   # build with scala-2.10
   echo "mvn clean install -DskipTests \
-    -Dmaven.repo.local=${tmp_repo} -Pscala-2.10 \
+    -Dmaven.repo.local=${tmp_repo} -Pscala-2.10 -Pbeam \
     ${PUBLISH_PROFILES} ${PROJECT_OPTIONS}"
-  mvn clean install -DskipTests -Dmaven.repo.local="${tmp_repo}" -Pscala-2.10 \
+  mvn clean install -DskipTests -Dmaven.repo.local="${tmp_repo}" -Pscala-2.10 -Pbeam \
     ${PUBLISH_PROFILES} ${PROJECT_OPTIONS}
   if [[ $? -ne 0 ]]; then
     echo "Build with scala 2.10 failed."
@@ -161,6 +153,5 @@ function publish_to_maven() {
 }
 
 git_clone
-publish_to_dockerhub
 publish_to_maven
 cleanup