Merge pull request #20 from danishjoseph:ci-fixes

Refactor Docker image naming and update image metadata
danishjoseph · Apr 24, 2024 · 73fd851 · 73fd851
2 parents a4a8922 + 8053979
commit 73fd851
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,9 +42,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Get version number
+        id: version
+        run: echo "::set-output name=version::$(git rev-list --count HEAD)"
+
       - name: Build Docker image
         run: |
-          docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/stockdog:alpha-${{ github.sha  }} .
+          docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/stockdog:alpha-${{ steps.version.outputs.version  }} .
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -53,17 +57,17 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Push Docker image
-        run: docker push ${{ secrets.DOCKER_HUB_USERNAME }}/stockdog:alpha-${{ github.sha }}
+        run: docker push ${{ secrets.DOCKER_HUB_USERNAME }}/stockdog:alpha-${{ steps.version.outputs.version }}
 
       - name: Update image metadata
         uses: docker/metadata-action@v5
         with:
-          images: ${{ secrets.DOCKER_HUB_USERNAME }}/stockdog:alpha-${{ github.sha }}
+          images: ${{ secrets.DOCKER_HUB_USERNAME }}/stockdog:alpha-${{ steps.version.outputs.version }}
           tags: |
             type=sha
           labels: |
             org.opencontainers.image.title=StockDog App
             org.opencontainers.image.description=Stock market analysis app
             org.opencontainers.image.url=https://github.com/${{github.repository}}
-            org.opencontainers.image.revision=${{github.sha}}
+            org.opencontainers.image.revision=${{steps.version.outputs.version}}
             org.opencontainers.image.licenses=MIT