Remove docker build

This commit is contained in:
Mina Lee 2017-01-19 16:27:46 +09:00
parent 236bf3ad6f
commit 3a9b64e311
2 changed files with 2 additions and 29 deletions

View file

@ -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}"

View file

@ -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"
@ -161,6 +153,5 @@ function publish_to_maven() {
}
git_clone
publish_to_dockerhub
publish_to_maven
cleanup