Merge 02386f7b16 into a2924a7819
This commit is contained in:
commit
f29ef5a7ae
|
|
@ -5,7 +5,7 @@ on:
|
||||||
- main
|
- main
|
||||||
jobs:
|
jobs:
|
||||||
docker:
|
docker:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-24.04
|
||||||
if: ${{ !contains(github.event.head_commit.message, 'docs:') }}
|
if: ${{ !contains(github.event.head_commit.message, 'docs:') }}
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
|
|
@ -16,7 +16,7 @@ jobs:
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ on:
|
||||||
- 'v*.*.*'
|
- 'v*.*.*'
|
||||||
jobs:
|
jobs:
|
||||||
docker:
|
docker:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Checkout
|
name: Checkout
|
||||||
|
|
@ -29,13 +29,13 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
VERSION_TAG=${GITHUB_REF#refs/tags/}
|
VERSION_TAG=${GITHUB_REF#refs/tags/}
|
||||||
echo "Git tag: $VERSION_TAG"
|
echo "Git tag: $VERSION_TAG"
|
||||||
|
|
||||||
VERSION=${VERSION_TAG#v}
|
VERSION=${VERSION_TAG#v}
|
||||||
echo "Full version without 'v': $VERSION"
|
echo "Full version without 'v': $VERSION"
|
||||||
|
|
||||||
MAJOR_VERSION=${VERSION%%.*}
|
MAJOR_VERSION=${VERSION%%.*}
|
||||||
echo "Major version: $MAJOR_VERSION"
|
echo "Major version: $MAJOR_VERSION"
|
||||||
|
|
||||||
echo "SITESPEED_VERSION=$VERSION" >> $GITHUB_OUTPUT
|
echo "SITESPEED_VERSION=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "SITESPEED_MAJOR_VERSION=$MAJOR_VERSION" >> $GITHUB_OUTPUT
|
echo "SITESPEED_MAJOR_VERSION=$MAJOR_VERSION" >> $GITHUB_OUTPUT
|
||||||
-
|
-
|
||||||
|
|
@ -60,7 +60,7 @@ jobs:
|
||||||
build-args: version=${{ steps.extract_version.outputs.SITESPEED_VERSION }}
|
build-args: version=${{ steps.extract_version.outputs.SITESPEED_VERSION }}
|
||||||
push: true
|
push: true
|
||||||
provenance: false
|
provenance: false
|
||||||
tags: |
|
tags: |
|
||||||
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_VERSION }}-plus1
|
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_VERSION }}-plus1
|
||||||
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}-plus1
|
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}-plus1
|
||||||
-
|
-
|
||||||
|
|
@ -73,6 +73,6 @@ jobs:
|
||||||
build-args: version=${{ steps.extract_version.outputs.SITESPEED_VERSION }}
|
build-args: version=${{ steps.extract_version.outputs.SITESPEED_VERSION }}
|
||||||
push: true
|
push: true
|
||||||
provenance: false
|
provenance: false
|
||||||
tags: |
|
tags: |
|
||||||
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_VERSION }}-slim
|
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_VERSION }}-slim
|
||||||
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}-slim
|
sitespeedio/sitespeed.io:${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}-slim
|
||||||
Loading…
Reference in New Issue