Fixing semver + extension

leplusorg · Apr 25, 2024 · 31c25c8 · 31c25c8
1 parent 0645400
commit 31c25c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -50,8 +50,8 @@ jobs:
         if: github.ref == 'refs/heads/main'
         run: |
           # shellcheck disable=SC2086
-          VERSION="$(\grep ${REPOSITORY}/Dockerfile -e '^FROM' | \head -n 1 | \sed -e 's/[-_][^:]*@.*$//; s/^.*://;')"
-          if [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
+          VERSION="$(\grep ${REPOSITORY}/Dockerfile -e '^FROM' | \head -n 1 | \sed -e 's/[-_][^:]*@.*$//; s/^.*://; s/\.\([0-9]\)*$/-\1/;')"
+          if [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+\-[0-9]+$ ]] ; then
             \echo "VERSION=${VERSION}" >> "${GITHUB_ENV}"
           fi
       - name: Check if release already exists

diff --git a/.github/workflows/dockerrelease.yml b/.github/workflows/dockerrelease.yml
@@ -26,6 +26,7 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}.{{patch}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha