Skip to content
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

chore(build): more tags #194

Closed
wants to merge 6 commits into from
Closed

chore(build): more tags #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
348bc43
feat: release 1.16.0
paul1r Jan 28, 2025
716c662
chore(release-1.16.x): release 1.16.0 (#189)
loki-gh-app[bot] Jan 28, 2025
198dbf1
feat: pass isLatest to in workflow (#190)
paul1r Jan 29, 2025
b1adfdb
chore(release-1.16.x): release 1.16.1 (#191)
loki-gh-app[bot] Jan 29, 2025
6934f7e
chore(build): bump release lib ref (#193)
paul1r Jan 29, 2025
bc73858
Add major and minor tagging too
paul1r Jan 29, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
DOCKER_USERNAME: "grafana"
DRY_RUN: false
IMAGE_PREFIX: "trevorwhitney075"
RELEASE_LIB_REF: "release-1.14.x"
RELEASE_LIB_REF: "release-1.16.x"
RELEASE_REPO: "grafana/loki-release"
SKIP_VALIDATION: false
USE_GITHUB_APP_TOKEN: true
Expand All @@ -18,7 +18,7 @@ jobs:
with:
build_image: "grafana/loki-build-image:0.34.3"
golang_ci_lint_version: "v1.60.3"
release_lib_ref: "release-1.14.x"
release_lib_ref: "release-1.16.x"
skip_validation: false
use_github_app_token: true
create-release-pr:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
BUILD_ARTIFACTS_BUCKET: "loki-build-artifacts"
IMAGE_PREFIX: "trevorwhitney075"
PUBLISH_TO_GCS: false
RELEASE_LIB_REF: "release-1.14.x"
RELEASE_LIB_REF: "release-1.16.x"
RELEASE_REPO: "grafana/loki-release"
USE_GITHUB_APP_TOKEN: true
jobs:
Expand Down Expand Up @@ -154,6 +154,7 @@ jobs:
buildDir: "release/clients/cmd/docker-driver"
imageDir: "plugins"
imagePrefix: "${{ env.IMAGE_PREFIX }}"
isLatest: "${{ needs.createRelease.outputs.isLatest }}"
isPlugin: true
publishImages:
needs:
Expand Down Expand Up @@ -192,6 +193,7 @@ jobs:
with:
imageDir: "images"
imagePrefix: "${{ env.IMAGE_PREFIX }}"
isLatest: "${{ needs.createRelease.outputs.isLatest }}"
publishRelease:
needs:
- "createRelease"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
DOCKER_USERNAME: "grafana"
DRY_RUN: true
IMAGE_PREFIX: "trevorwhitney075"
RELEASE_LIB_REF: "release-1.14.x"
RELEASE_LIB_REF: "release-1.16.x"
RELEASE_REPO: "grafana/loki-release"
SKIP_VALIDATION: false
USE_GITHUB_APP_TOKEN: true
Expand All @@ -18,7 +18,7 @@ jobs:
with:
build_image: "grafana/loki-build-image:0.34.3"
golang_ci_lint_version: "v1.60.3"
release_lib_ref: "release-1.14.x"
release_lib_ref: "release-1.16.x"
skip_validation: false
use_github_app_token: true
create-release-pr:
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
".": "1.14.2",
".": "1.16.1",
"operator": "0.1.0"
}
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## [1.16.1](https://github.com/grafana/loki-release/compare/v1.16.0...v1.16.1) (2025-01-29)


### Features

* pass isLatest to in workflow ([#190](https://github.com/grafana/loki-release/issues/190)) ([198dbf1](https://github.com/grafana/loki-release/commit/198dbf103159f0c7cc795ae4f13cfea08dcd9afa))

## [1.16.0](https://github.com/grafana/loki-release/compare/v1.14.2...v1.16.0) (2025-01-28)


### Features

* build docker plugin on native runners ([#185](https://github.com/grafana/loki-release/issues/185)) ([77c60db](https://github.com/grafana/loki-release/commit/77c60db20156d69c1ab872c66ccef4f66b3abb67))
* fix the docker driver release ([#169](https://github.com/grafana/loki-release/issues/169)) ([cfa2425](https://github.com/grafana/loki-release/commit/cfa24256090828f566f1ba59292ce65d8db4a4ae))
* release 1.16.0 ([348bc43](https://github.com/grafana/loki-release/commit/348bc43588d5cb42af424d738a494ae47abf09e4))

## [1.14.2](https://github.com/grafana/loki-release/compare/v1.14.1...v1.14.2) (2024-12-17)


Expand Down
66 changes: 65 additions & 1 deletion actions/push-images/__tests__/docker.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,65 +157,129 @@
'docker load -i /images/fluentd-2.9.4-linux-amd64.tar',
'docker tag grafana/fluentd:2.9.4-amd64 grafana/fluentd:latest-amd64',
'docker push grafana/fluentd:latest-amd64',
'docker tag grafana/fluentd:2.9.4-amd64 grafana/fluentd:v2-amd64',
'docker push grafana/fluentd:v2-amd64',
'docker tag grafana/fluentd:2.9.4-amd64 grafana/fluentd:v2.9-amd64',
'docker push grafana/fluentd:v2.9-amd64',
'docker push -a grafana/fluentd',
'docker manifest create grafana/fluentd:2.9.4 grafana/fluentd:2.9.4-amd64',
'docker manifest push grafana/fluentd:2.9.4',
'docker manifest create grafana/fluentd:latest grafana/fluentd:latest-amd64',
'docker manifest push grafana/fluentd:latest',
'docker manifest create grafana/fluentd:v2 grafana/fluentd:v2-amd64',
'docker manifest push grafana/fluentd:v2',
'docker manifest create grafana/fluentd:v2.9 grafana/fluentd:v2.9-amd64',
'docker manifest push grafana/fluentd:v2.9',

'docker load -i /images/logcli-2.9.4-linux-amd64.tar',
'docker tag grafana/logcli:2.9.4-amd64 grafana/logcli:latest-amd64',
'docker push grafana/logcli:latest-amd64',
'docker tag grafana/logcli:2.9.4-amd64 grafana/logcli:v2-amd64',
'docker push grafana/logcli:v2-amd64',
'docker tag grafana/logcli:2.9.4-amd64 grafana/logcli:v2.9-amd64',
'docker push grafana/logcli:v2.9-amd64',
'docker load -i /images/logcli-2.9.4-linux-arm.tar',
'docker tag grafana/logcli:2.9.4-arm grafana/logcli:latest-arm',
'docker push grafana/logcli:latest-arm',
'docker tag grafana/logcli:2.9.4-arm grafana/logcli:v2-arm',
'docker push grafana/logcli:v2-arm',
'docker tag grafana/logcli:2.9.4-arm grafana/logcli:v2.9-arm',
'docker push grafana/logcli:v2.9-arm',

Check failure on line 187 in actions/push-images/__tests__/docker.test.ts

View workflow job for this annotation

GitHub Actions / lint 

Delete `··`

Check failure on line 187 in actions/push-images/__tests__/docker.test.ts

View workflow job for this annotation

GitHub Actions / lint 

Delete `··`
'docker load -i /images/logcli-2.9.4-linux-arm64.tar',
'docker tag grafana/logcli:2.9.4-arm64 grafana/logcli:latest-arm64',
'docker push grafana/logcli:latest-arm64',
'docker tag grafana/logcli:2.9.4-arm64 grafana/logcli:v2-arm64',
'docker push grafana/logcli:v2-arm64',
'docker tag grafana/logcli:2.9.4-arm64 grafana/logcli:v2.9-arm64',
'docker push grafana/logcli:v2.9-arm64',
'docker push -a grafana/logcli',
'docker manifest create grafana/logcli:2.9.4 grafana/logcli:2.9.4-amd64 grafana/logcli:2.9.4-arm grafana/logcli:2.9.4-arm64',
'docker manifest push grafana/logcli:2.9.4',
'docker manifest create grafana/logcli:latest grafana/logcli:latest-amd64 grafana/logcli:latest-arm grafana/logcli:latest-arm64',
'docker manifest push grafana/logcli:latest',
'docker manifest create grafana/logcli:v2 grafana/logcli:v2-amd64 grafana/logcli:v2-arm grafana/logcli:v2-arm64',
'docker manifest push grafana/logcli:v2',
'docker manifest create grafana/logcli:v2.9 grafana/logcli:v2.9-amd64 grafana/logcli:v2.9-arm grafana/logcli:v2.9-arm64',
'docker manifest push grafana/logcli:v2.9',

'docker load -i /images/logstash-2.9.4-linux-amd64.tar',
'docker tag grafana/logstash:2.9.4-amd64 grafana/logstash:latest-amd64',
'docker push grafana/logstash:latest-amd64',
'docker tag grafana/logstash:2.9.4-amd64 grafana/logstash:v2-amd64',
'docker push grafana/logstash:v2-amd64',
'docker tag grafana/logstash:2.9.4-amd64 grafana/logstash:v2.9-amd64',
'docker push grafana/logstash:v2.9-amd64',
'docker push -a grafana/logstash',
'docker manifest create grafana/logstash:2.9.4 grafana/logstash:2.9.4-amd64',
'docker manifest push grafana/logstash:2.9.4',
'docker manifest create grafana/logstash:latest grafana/logstash:latest-amd64',
'docker manifest push grafana/logstash:latest',
'docker manifest create grafana/logstash:v2 grafana/logstash:v2-amd64',
'docker manifest push grafana/logstash:v2',
'docker manifest create grafana/logstash:v2.9 grafana/logstash:v2.9-amd64',
'docker manifest push grafana/logstash:v2.9',

'docker load -i /images/loki-2.9.4-linux-amd64.tar',
'docker tag grafana/loki:2.9.4-amd64 grafana/loki:latest-amd64',
'docker push grafana/loki:latest-amd64',
'docker tag grafana/loki:2.9.4-amd64 grafana/loki:v2-amd64',
'docker push grafana/loki:v2-amd64',
'docker tag grafana/loki:2.9.4-amd64 grafana/loki:v2.9-amd64',
'docker push grafana/loki:v2.9-amd64',
'docker load -i /images/loki-2.9.4-linux-arm.tar',
'docker tag grafana/loki:2.9.4-arm grafana/loki:latest-arm',
'docker push grafana/loki:latest-arm',
'docker tag grafana/loki:2.9.4-arm grafana/loki:v2-arm',

Check failure on line 232 in actions/push-images/__tests__/docker.test.ts

View workflow job for this annotation

GitHub Actions / lint 

Delete `··`

Check failure on line 232 in actions/push-images/__tests__/docker.test.ts

View workflow job for this annotation

GitHub Actions / lint 

Delete `··`
'docker push grafana/loki:v2-arm',
'docker tag grafana/loki:2.9.4-arm grafana/loki:v2.9-arm',
'docker push grafana/loki:v2.9-arm',
'docker load -i /images/loki-2.9.4-linux-arm64.tar',
'docker tag grafana/loki:2.9.4-arm64 grafana/loki:latest-arm64',
'docker push grafana/loki:latest-arm64',
'docker tag grafana/loki:2.9.4-arm64 grafana/loki:v2-arm64',
'docker push grafana/loki:v2-arm64',
'docker tag grafana/loki:2.9.4-arm64 grafana/loki:v2.9-arm64',
'docker push grafana/loki:v2.9-arm64',
'docker push -a grafana/loki',
'docker manifest create grafana/loki:2.9.4 grafana/loki:2.9.4-amd64 grafana/loki:2.9.4-arm grafana/loki:2.9.4-arm64',
'docker manifest push grafana/loki:2.9.4',
'docker manifest create grafana/loki:latest grafana/loki:latest-amd64 grafana/loki:latest-arm grafana/loki:latest-arm64',
'docker manifest push grafana/loki:latest',
'docker manifest create grafana/loki:v2 grafana/loki:v2-amd64 grafana/loki:v2-arm grafana/loki:v2-arm64',
'docker manifest push grafana/loki:v2',
'docker manifest create grafana/loki:v2.9 grafana/loki:v2.9-amd64 grafana/loki:v2.9-arm grafana/loki:v2.9-arm64',
'docker manifest push grafana/loki:v2.9',

'docker load -i /images/loki-canary-2.9.4-linux-amd64.tar',
'docker tag grafana/loki-canary:2.9.4-amd64 grafana/loki-canary:latest-amd64',
'docker push grafana/loki-canary:latest-amd64',
'docker tag grafana/loki-canary:2.9.4-amd64 grafana/loki-canary:v2-amd64',
'docker push grafana/loki-canary:v2-amd64',
'docker tag grafana/loki-canary:2.9.4-amd64 grafana/loki-canary:v2.9-amd64',
'docker push grafana/loki-canary:v2.9-amd64',
'docker load -i /images/loki-canary-2.9.4-linux-arm.tar',
'docker tag grafana/loki-canary:2.9.4-arm grafana/loki-canary:latest-arm',
'docker push grafana/loki-canary:latest-arm',
'docker tag grafana/loki-canary:2.9.4-arm grafana/loki-canary:v2-arm',
'docker push grafana/loki-canary:v2-arm',
'docker tag grafana/loki-canary:2.9.4-arm grafana/loki-canary:v2.9-arm',
'docker push grafana/loki-canary:v2.9-arm',
'docker load -i /images/loki-canary-2.9.4-linux-arm64.tar',
'docker tag grafana/loki-canary:2.9.4-arm64 grafana/loki-canary:latest-arm64',
'docker push grafana/loki-canary:latest-arm64',
'docker tag grafana/loki-canary:2.9.4-arm64 grafana/loki-canary:v2-arm64',
'docker push grafana/loki-canary:v2-arm64',
'docker tag grafana/loki-canary:2.9.4-arm64 grafana/loki-canary:v2.9-arm64',
'docker push grafana/loki-canary:v2.9-arm64',
'docker push -a grafana/loki-canary',
'docker manifest create grafana/loki-canary:2.9.4 grafana/loki-canary:2.9.4-amd64 grafana/loki-canary:2.9.4-arm grafana/loki-canary:2.9.4-arm64',
'docker manifest push grafana/loki-canary:2.9.4',
'docker manifest create grafana/loki-canary:latest grafana/loki-canary:latest-amd64 grafana/loki-canary:latest-arm grafana/loki-canary:latest-arm64',
'docker manifest push grafana/loki-canary:latest'
'docker manifest push grafana/loki-canary:latest',
'docker manifest create grafana/loki-canary:v2 grafana/loki-canary:v2-amd64 grafana/loki-canary:v2-arm grafana/loki-canary:v2-arm64',
'docker manifest push grafana/loki-canary:v2',
'docker manifest create grafana/loki-canary:v2.9 grafana/loki-canary:v2.9-amd64 grafana/loki-canary:v2.9-arm grafana/loki-canary:v2.9-arm64',
'docker manifest push grafana/loki-canary:v2.9'
])
})

Expand Down
4 changes: 4 additions & 0 deletions actions/push-images/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ inputs:
buildDir:
description: 'directory to build rootfs for docker plugin'
required: false
isLatest:
description: 'should we tag the image as latest'
default: 'false'
required: false

# Define your outputs here.
outputs: {}
Expand Down
29 changes: 26 additions & 3 deletions actions/push-images/src/docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@
if (isLatest) {
commands.push(
`docker plugin create ${repo}/${image}:latest-${shortPlatform} "${buildDir}"`,
`docker plugin push "${repo}/${image}:latest-${shortPlatform}"`
`docker plugin push "${repo}/${image}:latest-${shortPlatform}"`,
// Add major version tag (e.g., v2-amd64)
`docker plugin create ${repo}/${image}:v${version.major}-${shortPlatform} "${buildDir}"`,
`docker plugin push "${repo}/${image}:v${version.major}-${shortPlatform}"`,
// Add major.minor version tag (e.g., v2.9-amd64)
`docker plugin create ${repo}/${image}:v${version.major}.${version.minor}-${shortPlatform} "${buildDir}"`,
`docker plugin push "${repo}/${image}:v${version.major}.${version.minor}-${shortPlatform}"`
)
}
}
Expand Down Expand Up @@ -115,7 +121,13 @@
if (isLatest) {
commands.push(
`docker tag ${repo}/${image}:${version.toString()}-${shortPlatform} ${repo}/${image}:latest-${shortPlatform}`,
`docker push ${repo}/${image}:latest-${shortPlatform}`
`docker push ${repo}/${image}:latest-${shortPlatform}`,
// Add major version tag (e.g., v2-amd64)
`docker tag ${repo}/${image}:${version.toString()}-${shortPlatform} ${repo}/${image}:v${version.major}-${shortPlatform}`,
`docker push ${repo}/${image}:v${version.major}-${shortPlatform}`,
// Add major.minor version tag (e.g., v2.9-amd64)
`docker tag ${repo}/${image}:${version.toString()}-${shortPlatform} ${repo}/${image}:v${version.major}.${version.minor}-${shortPlatform}`,
`docker push ${repo}/${image}:v${version.major}.${version.minor}-${shortPlatform}`
)
}
}
Expand All @@ -131,9 +143,20 @@
const latestManifests = manifests.map(m =>
m.replace(`:${version.toString()}-`, ':latest-')
)
const majorManifests = manifests.map(m =>
m.replace(`:${version.toString()}-`, `:v${version.major}-`)
)
const majorMinorManifests = manifests.map(m =>
m.replace(`:${version.toString()}-`, `:v${version.major}.${version.minor}-`)

Check failure on line 150 in actions/push-images/src/docker.ts

View workflow job for this annotation

GitHub Actions / lint 

Replace ``:${version.toString()}-`,·`:v${version.major}.${version.minor}-`)` with `⏎··········`:${version.toString()}-`,⏎··········`:v${version.major}.${version.minor}-``

Check failure on line 150 in actions/push-images/src/docker.ts

View workflow job for this annotation

GitHub Actions / lint 

Replace ``:${version.toString()}-`,·`:v${version.major}.${version.minor}-`)` with `⏎··········`:${version.toString()}-`,⏎··········`:v${version.major}.${version.minor}-``
)

Check failure on line 151 in actions/push-images/src/docker.ts

View workflow job for this annotation

GitHub Actions / lint 

Insert `··`

Check failure on line 151 in actions/push-images/src/docker.ts

View workflow job for this annotation

GitHub Actions / lint 

Insert `··`

Check failure on line 152 in actions/push-images/src/docker.ts

View workflow job for this annotation

GitHub Actions / lint 

Insert `)⏎`

Check failure on line 152 in actions/push-images/src/docker.ts

View workflow job for this annotation

GitHub Actions / lint 

Insert `)⏎`
commands.push(
`docker manifest create ${repo}/${image}:latest ${latestManifests.join(' ')}`,
`docker manifest push ${repo}/${image}:latest`
`docker manifest push ${repo}/${image}:latest`,
`docker manifest create ${repo}/${image}:v${version.major} ${majorManifests.join(' ')}`,
`docker manifest push ${repo}/${image}:v${version.major}`,
`docker manifest create ${repo}/${image}:v${version.major}.${version.minor} ${majorMinorManifests.join(' ')}`,
`docker manifest push ${repo}/${image}:v${version.major}.${version.minor}`
)
}
}
Expand Down
2 changes: 2 additions & 0 deletions workflows/release.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ local pullRequestFooter = 'Merging this PR will release the [artifacts](https://
+ step.with({
imageDir: 'images',
imagePrefix: '${{ env.IMAGE_PREFIX }}',
isLatest: '${{ needs.createRelease.outputs.isLatest }}',
}),
]
),
Expand Down Expand Up @@ -219,6 +220,7 @@ local pullRequestFooter = 'Merging this PR will release the [artifacts](https://
imagePrefix: '${{ env.IMAGE_PREFIX }}',
isPlugin: true,
buildDir: 'release/%s' % path,
isLatest: '${{ needs.createRelease.outputs.isLatest }}',
}),
]
),
Expand Down
6 changes: 3 additions & 3 deletions workflows/workflows.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ local dockerPluginDir = 'clients/cmd/docker-driver';
buildArtifactsBucket='loki-build-artifacts',
branches=['release-[0-9]+.[0-9]+.x'],
imagePrefix='trevorwhitney075',
releaseLibRef='release-1.14.x',
releaseLibRef='release-1.16.x',
releaseRepo='grafana/loki-release',
skipValidation=false,
versioningStrategy='always-bump-patch',
Expand All @@ -35,7 +35,7 @@ local dockerPluginDir = 'clients/cmd/docker-driver';
branches=['release-[0-9]+.[0-9]+.x'],
dryRun=true,
imagePrefix='trevorwhitney075',
releaseLibRef='release-1.14.x',
releaseLibRef='release-1.16.x',
releaseRepo='grafana/loki-release',
skipValidation=false,
versioningStrategy='always-bump-patch',
Expand All @@ -54,7 +54,7 @@ local dockerPluginDir = 'clients/cmd/docker-driver';
getDockerCredsFromVault=false,
imagePrefix='trevorwhitney075',
pluginBuildDir=dockerPluginDir,
releaseLibRef='release-1.14.x',
releaseLibRef='release-1.16.x',
releaseRepo='grafana/loki-release',
useGitHubAppToken=true,
) + {
Expand Down
Loading