diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index 7e0c25409..f779a12b9 100755 --- a/scripts/rel/cut.sh +++ b/scripts/rel/cut.sh @@ -32,9 +32,6 @@ options: --prev-tag : Provide the prev tag to automatically generate changelogs If this option is absent, the tag found by git describe will be used - --docker-latest: Set this option to assign :latest tag on the corresponding docker image - in addition to regular : one - For 5.1 series the current working branch must be 'release-51' --.--[ master ]---------------------------.-----------.--- @@ -61,21 +58,18 @@ logmsg() { } TAG="${1:-}" -DOCKER_LATEST_TAG= case "$TAG" in v*) TAG_PREFIX='v' PROFILE='emqx' SKIP_APPUP='yes' - DOCKER_LATEST_TAG='docker-latest-ce' ;; e*) TAG_PREFIX='e' PROFILE='emqx-enterprise' #TODO change to no when we are ready to support hot-upgrade SKIP_APPUP='yes' - DOCKER_LATEST_TAG='docker-latest-ee' ;; -h|--help) usage @@ -91,7 +85,6 @@ esac shift 1 DRYRUN='no' -DOCKER_LATEST='no' while [ "$#" -gt 0 ]; do case $1 in -h|--help) @@ -119,10 +112,6 @@ while [ "$#" -gt 0 ]; do PREV_TAG="$1" shift ;; - --docker-latest) - DOCKER_LATEST='yes' - shift - ;; *) logerr "Unknown option $1" exit 1 @@ -266,9 +255,6 @@ generate_changelog () { if [ "$DRYRUN" = 'yes' ]; then logmsg "Release tag is ready to be created with command: git tag $TAG" - if [ "$DOCKER_LATEST" = 'yes' ]; then - logmsg "Docker latest tag is ready to be created with command: git tag --force $DOCKER_LATEST_TAG" - fi else case "$TAG" in *rc*) @@ -286,14 +272,6 @@ else esac git tag "$TAG" logmsg "$TAG is created OK." - if [ "$DOCKER_LATEST" = 'yes' ]; then - git tag --force "$DOCKER_LATEST_TAG" - logmsg "$DOCKER_LATEST_TAG is created OK." - fi - logwarn "Don't forget to push the tags!" - if [ "$DOCKER_LATEST" = 'yes' ]; then - echo "git push --atomic --force origin $TAG $DOCKER_LATEST_TAG" - else - echo "git push origin $TAG" - fi + logwarn "Don't forget to push the tag!" + echo "git push origin $TAG" fi