Skip to content

Automated the docker image tag update in Makefile #6643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhxiaogg wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −2
Open

Automated the docker image tag update in Makefile #6643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@
'gomodTidy',
'gomodVendor',
],
customManagers: [
{
description: 'Update tempo-ci-tools image tag in Makefile and build/tools.mk',
customType: 'regex',
managerFilePatterns: ['/^Makefile$/', '/^build\\/tools\\.mk$/'],
matchStrings: [
'TEMPO_CI_TOOLS_IMAGE\\s*\\?=\\s*(?<depName>grafana/tempo-ci-tools):(?<currentValue>main-[0-9a-f]{7}-\\d{8}-\\d{6})(?:@(?<currentDigest>sha256:[a-f0-9]+))?',
'TOOLS_IMAGE_TAG\\s*\\?=\\s*(?<currentValue>main-[0-9a-f]{7}-\\d{8}-\\d{6})',
],
depNameTemplate: 'grafana/tempo-ci-tools',
datasourceTemplate: 'docker',
},
],
packageRules: [
{
description: 'Disable all non-vulnerability updates for releases',
Expand Down Expand Up @@ -100,5 +113,17 @@
],
groupName: 'docker',
},
{
description: 'Use regex versioning for tempo-ci-tools (branch-sha-datetime tags)',
matchManagers: [
'custom.regex',
],
matchPackageNames: [
'grafana/tempo-ci-tools',
],
groupName: 'tempo-ci-tools',
versioning: 'regex:^main-[0-9a-f]{7}-(?<major>\\d{8})-(?<patch>\\d{6})$',
minimumReleaseAge: '0 days',
},
],
}
4 changes: 2 additions & 2 deletions .github/workflows/docker-ci-tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- id: get-tag
run: |
echo "tag=$(./tools/image-tag)" >> "$GITHUB_OUTPUT"
echo "tag=$(./tools/image-tag)-$(date +%Y%m%d-%H%M%S)" >> "$GITHUB_OUTPUT"

docker-ci-tools:
if: github.repository == 'grafana/tempo'
Expand Down Expand Up @@ -85,5 +85,5 @@ jobs:
docker manifest create \
$IMAGE_NAME:latest \
--amend $IMAGE_NAME:$TAG-amd64 \
--amend $IMAGE_NAME:$TAG-arm64
--amend $IMAGE_NAME:$TAG-arm64
docker manifest push $IMAGE_NAME:latest
Loading