Update dockerimage.yml

leplusorg · Apr 24, 2024 · 0645400 · 0645400
1 parent e1d990e
commit 0645400
Showing 1 changed file with 2 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]+$ ]] ; then
+          VERSION="$(\grep ${REPOSITORY}/Dockerfile -e '^FROM' | \head -n 1 | \sed -e 's/[-_][^:]*@.*$//; s/^.*://;')"
+          if [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
             \echo "VERSION=${VERSION}" >> "${GITHUB_ENV}"
           fi
       - name: Check if release already exists