diff --git a/scripts/deploy-test.sh b/scripts/deploy-test.sh index 19d32bf..e1cda44 100644 --- a/scripts/deploy-test.sh +++ b/scripts/deploy-test.sh @@ -69,7 +69,10 @@ if [ "$NO_BUILD" = false ]; then cd "$PROJECT_DIR" BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's/\//-/g') - TAG="$(date +%Y%m%d%H%M)-${BRANCH}" + COMMIT_SHORT=$(git rev-parse --short HEAD) + GIT_DIRTY="" + git diff --quiet && git diff --cached --quiet 2>/dev/null || GIT_DIRTY="-dirty" + TAG="$(date +%Y%m%d%H%M)-${BRANCH}-${COMMIT_SHORT}${GIT_DIRTY}" IMAGE="${DOCKER_REGISTRY}:${TAG}" info "分支: ${BRANCH}" diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 8abc6bb..e911632 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -72,7 +72,10 @@ if [ "$NO_BUILD" = false ]; then cd "$PROJECT_DIR" BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's/\//-/g') - TAG="$(date +%Y%m%d%H%M)-${BRANCH}" + COMMIT_SHORT=$(git rev-parse --short HEAD) + GIT_DIRTY="" + git diff --quiet && git diff --cached --quiet 2>/dev/null || GIT_DIRTY="-dirty" + TAG="$(date +%Y%m%d%H%M)-${BRANCH}-${COMMIT_SHORT}${GIT_DIRTY}" IMAGE="${DOCKER_REGISTRY}:${TAG}" info "分支: ${BRANCH}"