Skip to content

Commit 23b5fc2

Browse files
fix: fix the docker driver build (backport release-3.3.x) (#15478)
1 parent bc1794e commit 23b5fc2

13 files changed

+181
-163
lines changed

.github/jsonnetfile.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "21f1189544e3976070cbdb6463f64c7a32dcc176"
11+
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae"
1212
}
1313
],
1414
"legacyImports": true

.github/jsonnetfile.lock.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "21f1189544e3976070cbdb6463f64c7a32dcc176",
12-
"sum": "IPS1oGR8k7jk6J2snciTycWFgtISCwXSPhJ3A+nEGvY="
11+
"version": "cfa24256090828f566f1ba59292ce65d8db4a4ae",
12+
"sum": "tml1dcFlo15kEE6JvN/nPY2xkhfeF3ERZjAyFbnguHA="
1313
}
1414
],
1515
"legacyImports": false

.github/release-workflows.jsonnet

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
local lokiRelease = import 'workflows/main.jsonnet';
2-
local build = lokiRelease.build;
32

3+
local build = lokiRelease.build;
44
local releaseLibRef = 'main';
5-
65
local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
6+
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
7+
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
8+
local golangCiLintVersion = 'v1.60.3';
9+
local imageBuildTimeoutMin = 60;
10+
local imagePrefix = 'grafana';
11+
local dockerPluginDir = 'clients/cmd/docker-driver';
712

813
local imageJobs = {
914
loki: build.image('loki', 'cmd/loki'),
@@ -15,7 +20,7 @@ local imageJobs = {
1520
'loki-canary-boringcrypto': build.image('loki-canary-boringcrypto', 'cmd/loki-canary-boringcrypto'),
1621
promtail: build.image('promtail', 'clients/cmd/promtail'),
1722
querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
18-
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', 'clients/cmd/docker-driver'),
23+
'loki-docker-driver': build.dockerPlugin('loki-docker-driver', dockerPluginDir, buildImage=buildImage, platform=['linux/amd64', 'linux/arm64']),
1924
};
2025

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

28-
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
29-
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
30-
local golangCiLintVersion = 'v1.60.3';
31-
32-
local imageBuildTimeoutMin = 60;
33-
local imagePrefix = 'grafana';
34-
3533
{
3634
'patch-release-pr.yml': std.manifestYamlDoc(
3735
lokiRelease.releasePRWorkflow(
@@ -77,6 +75,7 @@ local imagePrefix = 'grafana';
7775
getDockerCredsFromVault=true,
7876
imagePrefix='grafana',
7977
releaseLibRef=releaseLibRef,
78+
pluginBuildDir=dockerPluginDir,
8079
releaseRepo='grafana/loki',
8180
useGitHubAppToken=true,
8281
), false, false

.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet

+18-86
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/workflows/main.jsonnet

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/workflows/release.libsonnet

+53-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/vendor/github.com/grafana/loki-release/workflows/workflows.jsonnet

+16-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.1"
5+
"build_image": "grafana/loki-build-image:0.34.3"
66
"golang_ci_lint_version": "v1.60.3"
77
"release_lib_ref": "main"
88
"skip_validation": false

.github/workflows/images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.34.1"
5+
"build_image": "grafana/loki-build-image:0.34.3"
66
"golang_ci_lint_version": "v1.60.3"
77
"release_lib_ref": "main"
88
"skip_validation": false

0 commit comments

Comments
 (0)