diff --git a/deploy.sh b/deploy.sh index deea7402..00d16fcf 100755 --- a/deploy.sh +++ b/deploy.sh @@ -12,19 +12,14 @@ fi set -x TAG="quay.io/pypa/${POLICY}_${PLATFORM}" -COMMIT_ABBREV_SHA=$(git show -s --format=%h "${COMMIT_SHA}") COMMIT_DATE=$(git show -s --format=%cd --date=short "${COMMIT_SHA}") -BUILD_ID=${COMMIT_DATE}-${COMMIT_ABBREV_SHA} -# Dependabot does not work with the BUILD_ID format -# Use a version like tag if eval "$(git rev-parse --is-shallow-repository)"; then git fetch --unshallow fi BUILD_NUMBER=$(git rev-list "--since=${COMMIT_DATE}T00:00:00Z" --first-parent --count "${COMMIT_SHA}") -BUILD_ID2=${COMMIT_DATE//-/.}-${BUILD_NUMBER} +BUILD_ID=${COMMIT_DATE//-/.}-${BUILD_NUMBER} # This should be a version like tag to allow dependabot updates docker tag "${TAG}:${COMMIT_SHA}" "${TAG}:${BUILD_ID}" -docker tag "${TAG}:${COMMIT_SHA}" "${TAG}:${BUILD_ID2}" docker tag "${TAG}:${COMMIT_SHA}" "${TAG}:latest" set +x @@ -32,6 +27,5 @@ set +x if [ $DRY_RUN -eq 0 ]; then docker login -u "${QUAY_USERNAME}" -p "${QUAY_PASSWORD}" quay.io docker push "${TAG}:${BUILD_ID}" - docker push "${TAG}:${BUILD_ID2}" docker push "${TAG}:latest" fi