Skip to content

Commit af09f53

Browse files
trevorwhitneytrevorwhitney
authored
ci: release workflows get build image from makefile (#12778)
1 parent 3cbdd95 commit af09f53

File tree

14 files changed

+109
-98
lines changed

14 files changed

+109
-98
lines changed

‎.drone/drone.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ steps:
139139
depends_on:
140140
- clone
141141
environment: {}
142-
image: grafana/loki-build-image:0.33.2
142+
image: grafana/loki-build-image:0.33.3
143143
name: documentation-helm-reference-check
144144
trigger:
145145
ref:
@@ -1085,7 +1085,7 @@ steps:
10851085
from_secret: docker_password
10861086
DOCKER_USERNAME:
10871087
from_secret: docker_username
1088-
image: grafana/loki-build-image:0.33.2
1088+
image: grafana/loki-build-image:0.33.3
10891089
name: build and push
10901090
privileged: true
10911091
volumes:
@@ -1308,6 +1308,6 @@ kind: secret
13081308
name: gpg_private_key
13091309
---
13101310
kind: signature
1311-
hmac: 87480bff973003712122d81a1575e2a62cff6fd4a42b163487cae6c6a67d8e7c
1311+
hmac: 33b9d2962b6dfcf1136ef7602d29e3f32f03b0d90dfd579652cbaf0a4ef2de4b
13121312

13131313
...

‎.github/release-workflows.jsonnet

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ local imageJobs = {
1717
querytee: build.image('loki-query-tee', 'cmd/querytee', platform=['linux/amd64']),
1818
};
1919

20-
local buildImage = 'grafana/loki-build-image:0.33.1';
20+
local buildImageVersion = std.extVar('BUILD_IMAGE_VERSION');
21+
local buildImage = 'grafana/loki-build-image:%s' % buildImageVersion;
2122
local golangCiLintVersion = 'v1.55.1';
2223

2324
local imageBuildTimeoutMin = 40;

‎.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.33.1"
5+
"build_image": "grafana/loki-build-image:0.33.3"
66
"golang_ci_lint_version": "v1.55.1"
77
"release_lib_ref": "main"
88
"skip_validation": false

‎.github/workflows/minor-release-pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.33.1"
19+
build_image: "grafana/loki-build-image:0.33.3"
2020
golang_ci_lint_version: "v1.55.1"
2121
release_lib_ref: "main"
2222
skip_validation: false
@@ -141,7 +141,7 @@ jobs:
141141
--env SKIP_ARM \
142142
--volume .:/src/loki \
143143
--workdir /src/loki \
144-
--entrypoint /bin/sh "grafana/loki-build-image:0.33.1"
144+
--entrypoint /bin/sh "grafana/loki-build-image:0.33.3"
145145
git config --global --add safe.directory /src/loki
146146
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
147147
make dist packages

‎.github/workflows/patch-release-pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.33.1"
19+
build_image: "grafana/loki-build-image:0.33.3"
2020
golang_ci_lint_version: "v1.55.1"
2121
release_lib_ref: "main"
2222
skip_validation: false
@@ -141,7 +141,7 @@ jobs:
141141
--env SKIP_ARM \
142142
--volume .:/src/loki \
143143
--workdir /src/loki \
144-
--entrypoint /bin/sh "grafana/loki-build-image:0.33.1"
144+
--entrypoint /bin/sh "grafana/loki-build-image:0.33.3"
145145
git config --global --add safe.directory /src/loki
146146
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
147147
make dist packages

‎Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
3636
# or you can override this with an environment variable
3737
BUILD_IN_CONTAINER ?= true
3838

39-
# ensure you run `make drone` after changing this
40-
BUILD_IMAGE_VERSION ?= 0.33.2
39+
# ensure you run `make drone` and `make release-workflows` after changing this
40+
BUILD_IMAGE_VERSION ?= 0.33.3
4141

4242
# Docker image info
4343
IMAGE_PREFIX ?= grafana
@@ -668,7 +668,8 @@ ifneq (,$(findstring WIP,$(IMAGE_TAG)))
668668
false;
669669
endif
670670
echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
671-
$(SUDO) $(BUILD_OCI) -o type=registry -t $(IMAGE_PREFIX)/loki-build-image:$(IMAGE_TAG) ./loki-build-image
671+
$(SUDO) DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker buildx build $(OCI_PLATFORMS) \
672+
-o type=registry -t $(IMAGE_PREFIX)/loki-build-image:$(BUILD_IMAGE_VERSION) ./loki-build-image
672673

673674
# loki-operator
674675
loki-operator-image:
@@ -899,7 +900,7 @@ scan-vulnerabilities: trivy snyk
899900
.PHONY: release-workflows
900901
release-workflows:
901902
pushd $(CURDIR)/.github && jb update && popd
902-
jsonnet -SJ .github/vendor -m .github/workflows .github/release-workflows.jsonnet
903+
jsonnet -SJ .github/vendor -m .github/workflows -V BUILD_IMAGE_VERSION=$(BUILD_IMAGE_VERSION) .github/release-workflows.jsonnet
903904

904905
.PHONY: release-workflows-check
905906
release-workflows-check:

‎docs/sources/shared/configuration.md

+32-32
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,6 @@ compactor_grpc_client:
431431
# values:
432432
#
433433
# Secure Ciphers:
434-
# - TLS_RSA_WITH_AES_128_CBC_SHA
435-
# - TLS_RSA_WITH_AES_256_CBC_SHA
436-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
437-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
438434
# - TLS_AES_128_GCM_SHA256
439435
# - TLS_AES_256_GCM_SHA384
440436
# - TLS_CHACHA20_POLY1305_SHA256
@@ -452,7 +448,11 @@ compactor_grpc_client:
452448
# Insecure Ciphers:
453449
# - TLS_RSA_WITH_RC4_128_SHA
454450
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
451+
# - TLS_RSA_WITH_AES_128_CBC_SHA
452+
# - TLS_RSA_WITH_AES_256_CBC_SHA
455453
# - TLS_RSA_WITH_AES_128_CBC_SHA256
454+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
455+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
456456
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
457457
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
458458
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
@@ -1387,10 +1387,6 @@ alertmanager_client:
13871387
# values:
13881388
#
13891389
# Secure Ciphers:
1390-
# - TLS_RSA_WITH_AES_128_CBC_SHA
1391-
# - TLS_RSA_WITH_AES_256_CBC_SHA
1392-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
1393-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
13941390
# - TLS_AES_128_GCM_SHA256
13951391
# - TLS_AES_256_GCM_SHA384
13961392
# - TLS_CHACHA20_POLY1305_SHA256
@@ -1408,7 +1404,11 @@ alertmanager_client:
14081404
# Insecure Ciphers:
14091405
# - TLS_RSA_WITH_RC4_128_SHA
14101406
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
1407+
# - TLS_RSA_WITH_AES_128_CBC_SHA
1408+
# - TLS_RSA_WITH_AES_256_CBC_SHA
14111409
# - TLS_RSA_WITH_AES_128_CBC_SHA256
1410+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
1411+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
14121412
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
14131413
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
14141414
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
@@ -1663,10 +1663,6 @@ evaluation:
16631663
# values:
16641664
#
16651665
# Secure Ciphers:
1666-
# - TLS_RSA_WITH_AES_128_CBC_SHA
1667-
# - TLS_RSA_WITH_AES_256_CBC_SHA
1668-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
1669-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
16701666
# - TLS_AES_128_GCM_SHA256
16711667
# - TLS_AES_256_GCM_SHA384
16721668
# - TLS_CHACHA20_POLY1305_SHA256
@@ -1684,7 +1680,11 @@ evaluation:
16841680
# Insecure Ciphers:
16851681
# - TLS_RSA_WITH_RC4_128_SHA
16861682
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
1683+
# - TLS_RSA_WITH_AES_128_CBC_SHA
1684+
# - TLS_RSA_WITH_AES_256_CBC_SHA
16871685
# - TLS_RSA_WITH_AES_128_CBC_SHA256
1686+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
1687+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
16881688
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
16891689
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
16901690
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
@@ -4281,10 +4281,6 @@ Configuration for an ETCD v3 client. Only applies if the selected kvstore is `et
42814281
# Override the default cipher suite list (separated by commas). Allowed values:
42824282
#
42834283
# Secure Ciphers:
4284-
# - TLS_RSA_WITH_AES_128_CBC_SHA
4285-
# - TLS_RSA_WITH_AES_256_CBC_SHA
4286-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4287-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
42884284
# - TLS_AES_128_GCM_SHA256
42894285
# - TLS_AES_256_GCM_SHA384
42904286
# - TLS_CHACHA20_POLY1305_SHA256
@@ -4302,7 +4298,11 @@ Configuration for an ETCD v3 client. Only applies if the selected kvstore is `et
43024298
# Insecure Ciphers:
43034299
# - TLS_RSA_WITH_RC4_128_SHA
43044300
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
4301+
# - TLS_RSA_WITH_AES_128_CBC_SHA
4302+
# - TLS_RSA_WITH_AES_256_CBC_SHA
43054303
# - TLS_RSA_WITH_AES_128_CBC_SHA256
4304+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4305+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
43064306
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
43074307
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
43084308
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
@@ -4489,10 +4489,6 @@ When a memberlist config with atleast 1 join_members is defined, kvstore of type
44894489
# Override the default cipher suite list (separated by commas). Allowed values:
44904490
#
44914491
# Secure Ciphers:
4492-
# - TLS_RSA_WITH_AES_128_CBC_SHA
4493-
# - TLS_RSA_WITH_AES_256_CBC_SHA
4494-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4495-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
44964492
# - TLS_AES_128_GCM_SHA256
44974493
# - TLS_AES_256_GCM_SHA384
44984494
# - TLS_CHACHA20_POLY1305_SHA256
@@ -4510,7 +4506,11 @@ When a memberlist config with atleast 1 join_members is defined, kvstore of type
45104506
# Insecure Ciphers:
45114507
# - TLS_RSA_WITH_RC4_128_SHA
45124508
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
4509+
# - TLS_RSA_WITH_AES_128_CBC_SHA
4510+
# - TLS_RSA_WITH_AES_256_CBC_SHA
45134511
# - TLS_RSA_WITH_AES_128_CBC_SHA256
4512+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4513+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
45144514
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
45154515
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
45164516
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
@@ -4625,10 +4625,6 @@ backoff_config:
46254625
# Override the default cipher suite list (separated by commas). Allowed values:
46264626
#
46274627
# Secure Ciphers:
4628-
# - TLS_RSA_WITH_AES_128_CBC_SHA
4629-
# - TLS_RSA_WITH_AES_256_CBC_SHA
4630-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4631-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
46324628
# - TLS_AES_128_GCM_SHA256
46334629
# - TLS_AES_256_GCM_SHA384
46344630
# - TLS_CHACHA20_POLY1305_SHA256
@@ -4646,7 +4642,11 @@ backoff_config:
46464642
# Insecure Ciphers:
46474643
# - TLS_RSA_WITH_RC4_128_SHA
46484644
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
4645+
# - TLS_RSA_WITH_AES_128_CBC_SHA
4646+
# - TLS_RSA_WITH_AES_256_CBC_SHA
46494647
# - TLS_RSA_WITH_AES_128_CBC_SHA256
4648+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4649+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
46504650
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
46514651
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
46524652
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
@@ -4707,10 +4707,6 @@ The TLS configuration.
47074707
# Override the default cipher suite list (separated by commas). Allowed values:
47084708
#
47094709
# Secure Ciphers:
4710-
# - TLS_RSA_WITH_AES_128_CBC_SHA
4711-
# - TLS_RSA_WITH_AES_256_CBC_SHA
4712-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4713-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
47144710
# - TLS_AES_128_GCM_SHA256
47154711
# - TLS_AES_256_GCM_SHA384
47164712
# - TLS_CHACHA20_POLY1305_SHA256
@@ -4728,7 +4724,11 @@ The TLS configuration.
47284724
# Insecure Ciphers:
47294725
# - TLS_RSA_WITH_RC4_128_SHA
47304726
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
4727+
# - TLS_RSA_WITH_AES_128_CBC_SHA
4728+
# - TLS_RSA_WITH_AES_256_CBC_SHA
47314729
# - TLS_RSA_WITH_AES_128_CBC_SHA256
4730+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4731+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
47324732
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
47334733
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
47344734
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
@@ -4875,10 +4875,6 @@ memcached_client:
48754875
# values:
48764876
#
48774877
# Secure Ciphers:
4878-
# - TLS_RSA_WITH_AES_128_CBC_SHA
4879-
# - TLS_RSA_WITH_AES_256_CBC_SHA
4880-
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4881-
# - TLS_RSA_WITH_AES_256_GCM_SHA384
48824878
# - TLS_AES_128_GCM_SHA256
48834879
# - TLS_AES_256_GCM_SHA384
48844880
# - TLS_CHACHA20_POLY1305_SHA256
@@ -4896,7 +4892,11 @@ memcached_client:
48964892
# Insecure Ciphers:
48974893
# - TLS_RSA_WITH_RC4_128_SHA
48984894
# - TLS_RSA_WITH_3DES_EDE_CBC_SHA
4895+
# - TLS_RSA_WITH_AES_128_CBC_SHA
4896+
# - TLS_RSA_WITH_AES_256_CBC_SHA
48994897
# - TLS_RSA_WITH_AES_128_CBC_SHA256
4898+
# - TLS_RSA_WITH_AES_128_GCM_SHA256
4899+
# - TLS_RSA_WITH_AES_256_GCM_SHA384
49004900
# - TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
49014901
# - TLS_ECDHE_RSA_WITH_RC4_128_SHA
49024902
# - TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA

‎loki-build-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_l
4949
# github.com/fatih/[email protected] requires golang.org/x/[email protected]
5050
# (not golang.org/x/[email protected] from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
5151
FROM golang:1.22.2-bookworm as faillint
52-
RUN GO111MODULE=on go install github.com/fatih/faillint@v1.11.0
52+
RUN GO111MODULE=on go install github.com/fatih/faillint@v1.12.0
5353
RUN GO111MODULE=on go install golang.org/x/tools/cmd/[email protected]
5454

5555
FROM golang:1.22.2-bookworm as delve

‎pkg/querier/queryrange/queryrangebase/queryrange.pb.go

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

‎pkg/querier/stats/stats.pb.go

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

‎pkg/ruler/base/ruler.pb.go

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

0 commit comments

Comments
 (0)