Merge pull request #4 from UnstoppableMango/sub-versioning

Author: UnstoppableMango

.github/workflows/ci.yml

@@ -25,7 +25,10 @@ jobs:
       uses: docker/setup-buildx-action@v1
 
     - name: Set Version
-      run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
+      run: |
+        GIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
+        echo "VERSION=$(cat VERSION).$GIT_HASH" >> $GITHUB_ENV
+        echo "APP_VERSION=$(cut -d'-' -f 1 VERSION)" >> $GITHUB_ENV
 
     - name: Build and Push
       uses: docker/build-push-action@v2
@@ -34,7 +37,7 @@ jobs:
         file: ./Dockerfile
         builder: ${{ steps.buildx.outputs.name }}
         push: ${{ github.event_name != 'pull_request' }}
-        args: VERSION=${{ env.VERSION }}
+        build-args: VERSION=${{ env.APP_VERSION }}
         tags: |
           ${{ secrets.DOCKER_HUB_USERNAME }}/multi-downloader-nx:latest
           ${{ secrets.DOCKER_HUB_USERNAME }}/multi-downloader-nx:${{ env.VERSION }}

.github/workflows/release.yml

@@ -0,0 +1,44 @@
+name: release
+
+on:
+  push:
+    branches:
+    - main
+    tags:
+    - "*.*.*"
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Login to Dockerhub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Set Version
+      run: |
+        TAG=${GITHUB_REF#refs/tags/}
+        echo "VERSION=$TAG" >> $GITHUB_ENV
+        echo "APP_VERSION=$(echo $TAG | cut -d'-' -f 1)" >> $GITHUB_ENV
+
+    - name: Build and Push
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./Dockerfile
+        builder: ${{ steps.buildx.outputs.name }}
+        push: true
+        build-args: VERSION=${{ env.APP_VERSION }}
+        tags: |
+          ${{ secrets.DOCKER_HUB_USERNAME }}/multi-downloader-nx:latest
+          ${{ secrets.DOCKER_HUB_USERNAME }}/multi-downloader-nx:${{ env.VERSION }}
+        cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME }}/multi-downloader-nx:buildcache
+        cache-to: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME }}/multi-downloader-nx:buildcache,mode=max

VERSION

@@ -1 +1 @@
-2.0.18
+2.0.18-d0