Add tags to manywheel; fix typo (#773)

* Add tags to manywheel; fix typo

* set local default values

Author: janeyx99

.github/workflows/build-manywheel-images.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Authenticate if WITH_PUSH
         run: |
           if [[ "${WITH_PUSH}" == true ]]; then
-            echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password--stdin
+            echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password-stdin
           fi
       - name: Build Docker Image
         run: |
@@ -57,7 +57,7 @@ jobs:
       - name: Authenticate if WITH_PUSH
         run: |
           if [[ "${WITH_PUSH}" == true ]]; then
-            echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password--stdin
+            echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password-stdin
           fi
       - name: Build Docker Image
         run: |
@@ -70,7 +70,7 @@ jobs:
       - name: Authenticate if WITH_PUSH
         run: |
           if [[ "${WITH_PUSH}" == true ]]; then
-            echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password--stdin
+            echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_ID}" --password-stdin
           fi
       - name: Build Docker Image
         run: |

manywheel/build_docker.sh

@@ -52,16 +52,30 @@ DOCKER_IMAGE=${DOCKER_REGISTRY}/pytorch/manylinux-builder:${DOCKER_TAG}
         "${TOPDIR}"
 )
 
+GITHUB_REF=${GITHUB_REF:-$(git symbolic-ref -q HEAD || git describe --tags --exact-match)}
+GIT_BRANCH_NAME=${GITHUB_REF##*/}
+GIT_COMMIT_SHA=${GITHUB_SHA:-$(git rev-parse HEAD)}
+DOCKER_IMAGE_BRANCH_TAG=${DOCKER_IMAGE}-${GIT_BRANCH_NAME}
+DOCKER_IMAGE_SHA_TAG=${DOCKER_IMAGE}-${GIT_COMMIT_SHA}
+
 (
     set -x
     docker tag ${DOCKER_IMAGE} ${LEGACY_DOCKER_IMAGE}
+    if [[ -n ${GITHUB_REF} ]]; then
+        docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_BRANCH_TAG}
+        docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_SHA_TAG}
+    fi
 )
 
 if [[ "${WITH_PUSH}" == true ]]; then
     (
         set -x
         docker push "${DOCKER_IMAGE}"
         docker push "${LEGACY_DOCKER_IMAGE}"
+        if [[ -n ${GITHUB_REF} ]]; then
+            docker push "${DOCKER_IMAGE_BRANCH_TAG}"
+            docker push "${DOCKER_IMAGE_SHA_TAG}"
+        fi
     )
 fi