push staging images on tags/release

change image names to be standards
fix nvcr dockerfile

Signed-off-by: Dushyant Behl <dushyantbehl@in.ibm.com>

Author: dushyantbehl

.github/workflows/dev-image.yaml

@@ -14,7 +14,7 @@ jobs:
         uses: ./.github/actions/free-up-disk-space
       - name: Build NVCR dev Image
         run: |
-          docker build -t fms-hf-tuning-dev:latest . -f build/nvcr.Dockerfile
+          docker build -t fms-hf-tuning:main-nvcr-latest . -f build/nvcr.Dockerfile
       - name: Login to Quay.io
         if: github.event_name == 'push'
         uses: docker/login-action@v3
@@ -25,4 +25,4 @@ jobs:
       - name: Push docker image for every commit to Quay.io as dev images
         if: github.event_name == 'push'
         run: |
-            docker push ${{ env.QUAY_REPOSITORY }}/fms-hf-tuning-dev:latest
+            docker push ${{ env.QUAY_REPOSITORY }}/fms-hf-tuning:main-nvcr-latest

.github/workflows/image.yaml

@@ -14,7 +14,10 @@ jobs:
         uses: ./.github/actions/free-up-disk-space
       - name: Build UBI9 Prod Image
         run: |
-          docker build -t fms-hf-tuning:latest . -f build/Dockerfile
+          docker build \
+            -t fms-hf-tuning:ubi9-latest \
+            -t fms-hf-tuning:release-ubi9-latest \
+            -f build/Dockerfile .
       - name: Login to Quay.io
         if: github.event_name == 'push'
         uses: docker/login-action@v3
@@ -25,4 +28,5 @@ jobs:
       - name: Push docker image to Quay.io
         if: github.event_name == 'push'
         run: |
-            docker push ${{ env.QUAY_REPOSITORY }}/fms-hf-tuning:latest
+            docker push ${{ env.QUAY_REPOSITORY }}/fms-hf-tuning:ubi9-latest
+            docker push ${{ env.QUAY_REPOSITORY }}/fms-hf-tuning:release-ubi9-latest

.github/workflows/release-image.yaml

@@ -0,0 +1,42 @@
+name: dev-image
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: "Free up disk space"
+        uses: ./.github/actions/free-up-disk-space
+      - name: Determine image tag
+        id: tag
+        run: |
+          if [ "${{ github.event_name }}" = "release" ]; then
+            TAG="${{ github.event.release.tag_name }}"
+          elif [ "${{ github.ref_type }}" = "tag" ]; then
+            TAG="${GITHUB_REF_NAME}"
+          else
+            TAG="dev"
+          fi
+          echo "IMAGE_TAG=$TAG" >> $GITHUB_ENV
+      - name: Build image
+        run: |
+          docker build \
+            -t fms-hf-tuning:${IMAGE_TAG}-nvcr \
+            -t fms-hf-tuning:staging-nvcr-latest \
+            -f build/nvcr.Dockerfile .
+      - name: Login to Quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+      - name: Push docker image to Quay.io
+        run: |
+            docker push ${{ env.QUAY_REPOSITORY }}/fms-hf-tuning:staging-nvcr-latest
+            docker push ${{ env.QUAY_REPOSITORY }}/fms-hf-tuning:${IMAGE_TAG}-nvcr

.github/workflows/staging-image.yaml

@@ -48,6 +48,7 @@ RUN pip install --upgrade --force-reinstall torch torchaudio torchvision --index
 COPY . ${SOURCE_DIR}
 RUN cd ${SOURCE_DIR}
 
+RUN pip install --upgrade pip setuptools wheel
 RUN pip install --no-cache-dir ${SOURCE_DIR}
 RUN pip install --user --no-build-isolation ${SOURCE_DIR}[flash-attn]