diff --git a/hack/publish.sh b/hack/publish.sh index 0d18ae5c92..1e2877e1f6 100755 --- a/hack/publish.sh +++ b/hack/publish.sh @@ -26,26 +26,15 @@ set -o pipefail # 3. cp default queue into release folder # 4. cp helm charts template into release folder and update default image tag # 5. cp license file into release folder -# 6. upload docker images to volcano.sh -# 7. generate zip file +# 6. generate zip file VK_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.. -BINARY_FOLDER=${VK_ROOT}/${BIN_DIR}/${REL_OSARCH} RELEASE_FOLDER=${VK_ROOT}/${RELEASE_DIR} -RELEASE_BINARY=${RELEASE_FOLDER}/bin README_FILE=${VK_ROOT}/installer/README.md HELM_FOLDER=${VK_ROOT}/installer/helm VOLCANO_IMAGE_TAG=${TAG:-"latest"} -DOCKER_PASSWORD=${DOCKER_PASSWORD:-""} -DOCKER_USERNAME=${DOCKER_USERNAME:-""} LICENSE_FILE=${VK_ROOT}/LICENSE -if [[ ! -d ${RELEASE_BINARY} ]];then - mkdir ${RELEASE_BINARY} -fi - -cp -r ${BINARY_FOLDER} ${RELEASE_BINARY} - cp ${README_FILE} ${RELEASE_FOLDER} cp -r ${HELM_FOLDER} ${RELEASE_FOLDER} @@ -57,27 +46,6 @@ fi # overwrite the tag name into values yaml sed -i "s/latest/${VOLCANO_IMAGE_TAG}/g" ${RELEASE_FOLDER}/helm/chart/volcano/values.yaml -if [[ "${DOCKER_USERNAME}xxx" == "xxx" ]];then - if [[ "${DOCKER_PASSWORD}xxx" == "xxx" ]];then - echo "docker username or password not found, quit uploading images" - exit 0 - fi -fi - -echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin -echo "pushing ${IMAGE_PREFIX}/vc-controller-manager:${VOLCANO_IMAGE_TAG}" -docker tag ${IMAGE_PREFIX}/vc-controller-manager:${VOLCANO_IMAGE_TAG} ${IMAGE_PREFIX}/vc-controllers:${VOLCANO_IMAGE_TAG} -docker push ${IMAGE_PREFIX}/vc-controllers:${VOLCANO_IMAGE_TAG} -docker push ${IMAGE_PREFIX}/vc-controller-manager:${VOLCANO_IMAGE_TAG} - -echo "pushing ${IMAGE_PREFIX}/vc-scheduler:${VOLCANO_IMAGE_TAG}" -docker push ${IMAGE_PREFIX}/vc-scheduler:${VOLCANO_IMAGE_TAG} - -echo "pushing ${IMAGE_PREFIX}/vc-webhook-manager:${VOLCANO_IMAGE_TAG}" -docker tag ${IMAGE_PREFIX}/vc-webhook-manager:${VOLCANO_IMAGE_TAG} ${IMAGE_PREFIX}/vc-admission:${VOLCANO_IMAGE_TAG} -docker push ${IMAGE_PREFIX}/vc-admission:${VOLCANO_IMAGE_TAG} -docker push ${IMAGE_PREFIX}/vc-webhook-manager:${VOLCANO_IMAGE_TAG} - echo "Generate release tar files" cd ${RELEASE_FOLDER}/ tar -zcvf volcano-${VOLCANO_IMAGE_TAG}-${OSTYPE}.tar.gz *