Update ci.yaml

Author: scuzzilla

.github/workflows/ci.yaml

@@ -5,41 +5,41 @@ on:
     branches:
       - main
 
+#tags:
+#  - v*
+
 env:
   IMAGE_NAME: mdt-dialout-collector
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build image
-        run: docker build docker --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
-
-  push:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    needs: build
+  ci:
     runs-on: ubuntu-latest
     permissions:
       packages: write
       contents: read
+
     steps:
       - uses: actions/checkout@v3
 
-      - name: Build image again
+      - name: Build image
         run: docker build docker --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
 
-      - name: Log in to GHCR
-        env:
-          GHCR_PAT: ${{ secrets.GHCR_PAT }}
-        run: |
-          echo "$GHCR_PAT" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Log into registry
+        run: echo "${{ secrets.GHCR_PAT }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Push image
         run: |
           IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-          IMAGE_ID=$(echo "$IMAGE_ID" | tr '[A-Z]' '[a-z]')
-          VERSION=latest
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Strip "v" prefix from tag name
+          #[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
           docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION