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

fix: fix the docker driver build (backport release-3.3.x) #15478

Merged
merged 2 commits into from
Dec 18, 2024
Merged

fix: fix the docker driver build (backport release-3.3.x) #15478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c6f7b
ci: fix the docker driver build (#15354)
trevorwhitney Dec 18, 2024
f29d45d
chore: revert Makefile change
trevorwhitney Dec 18, 2024
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
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "21f1189544e3976070cbdb6463f64c7a32dcc176"
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "21f1189544e3976070cbdb6463f64c7a32dcc176",
"sum": "IPS1oGR8k7jk6J2snciTycWFgtISCwXSPhJ3A+nEGvY="
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae",
"sum": "tml1dcFlo15kEE6JvN/nPY2xkhfeF3ERZjAyFbnguHA="
}
],
"legacyImports": false
Expand Down
19 changes: 9 additions & 10 deletions .github/release-workflows.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
local lokiRelease = import 'workflows/main.jsonnet';
local build = lokiRelease.build;

local build = lokiRelease.build;
local releaseLibRef = 'main';

local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
local golangCiLintVersion = 'v1.60.3';
local imageBuildTimeoutMin = 60;
local imagePrefix = 'grafana';
local dockerPluginDir = 'clients/cmd/docker-driver';

local imageJobs = {
loki: build.image('loki', 'cmd/loki'),
Expand All @@ -15,7 +20,7 @@ local imageJobs = {
'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
promtail: build.image('promtail', 'clients/cmd/promtail'),
querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', 'clients/cmd/docker-driver'),
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=['linux/amd64', 'linux/arm64']),
};

local weeklyImageJobs = {
Expand All @@ -25,13 +30,6 @@ local weeklyImageJobs = {
promtail: build.weeklyImage('promtail', 'clients/cmd/promtail'),
};

local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
local golangCiLintVersion = 'v1.60.3';

local imageBuildTimeoutMin = 60;
local imagePrefix = 'grafana';

{
'patch-release-pr.yml': std.manifestYamlDoc(
lokiRelease.releasePRWorkflow(
Expand Down Expand Up @@ -77,6 +75,7 @@ local imagePrefix = 'grafana';
getDockerCredsFromVault=true,
imagePrefix='grafana',
releaseLibRef=releaseLibRef,
pluginBuildDir=dockerPluginDir,
releaseRepo='grafana/loki',
useGitHubAppToken=true,
), false, false
Expand Down
104 changes: 18 additions & 86 deletions .github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 53 additions & 15 deletions .github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 16 additions & 5 deletions .github/vendor/github.com/grafana/loki-release/workflows/workflows.jsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.34.1"
"build_image": "grafana/loki-build-image:0.34.3"
"golang_ci_lint_version": "v1.60.3"
"release_lib_ref": "main"
"skip_validation": false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.34.1"
"build_image": "grafana/loki-build-image:0.34.3"
"golang_ci_lint_version": "v1.60.3"
"release_lib_ref": "main"
"skip_validation": false
Expand Down
Loading
Loading