ci: fix version extraction regexp (#563)

Automattic · Oct 30, 2023 · 6c68543 · 6c68543
1 parent cfc9980
commit 6c68543
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Get image version
         id: getversion
-        run: echo "version=$(head -n 1 alpine/Dockerfile | sed -e 's/FROM alpine:\(.*\)/\1/')" >> $GITHUB_OUTPUT
+        run: echo "version=$(head -n 1 alpine/Dockerfile | sed -r -e 's/^([^:]+):([^ @$-]+).*/\2/')" >> $GITHUB_OUTPUT
 
       - name: Build container image
         uses: docker/build-push-action@v5

diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Get image version
         id: getversion
-        run: echo "version=$(head -n 1 nginx/Dockerfile | sed -e 's/FROM nginx:\(.*\)-alpine/\1/')" >> $GITHUB_OUTPUT
+        run: echo "version=$(head -n 1 nginx/Dockerfile | sed -r -e 's/^([^:]+):([^ @$-]+).*/\2/')" >> $GITHUB_OUTPUT
 
       - name: Build container image
         uses: docker/build-push-action@v5

diff --git a/.github/workflows/traefik.yml b/.github/workflows/traefik.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Get image version
         id: getversion
-        run: echo "version=$(head -n 1 traefik/Dockerfile | sed -e 's/FROM traefik:\(.*\)/\1/')" >> $GITHUB_OUTPUT
+        run: echo "version=$(head -n 1 traefik/Dockerfile | sed -r -e 's/^([^:]+):([^ @$-]+).*/\2/')" >> $GITHUB_OUTPUT
 
       - name: Build container image
         uses: docker/build-push-action@v5