Skip to content

Commit 6d59d16

Browse files
qclaoguiqclaogui
committed
Refactor Docker image update process and consolidate configuration files
Signed-off-by: Weifeng Wang <[email protected]> Refactor Docker image update process and consolidate configuration files Signed-off-by: Weifeng Wang <[email protected]> Refactor Docker image update process and consolidate configuration files Signed-off-by: Weifeng Wang <[email protected]>
1 parent d27ee68 commit 6d59d16

File tree

7 files changed

+209
-144
lines changed

7 files changed

+209
-144
lines changed

‎.github/updatecli.d/docker-image/update-alloy-image.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Update alloy image versions
2+
3+
sources:
4+
alloy-version:
5+
kind: dockerimage
6+
spec:
7+
image: docker.io/grafana/alloy
8+
versionfilter:
9+
kind: semver
10+
pattern: "~1.x"
11+
12+
conditions:
13+
check-alloy-image:
14+
kind: dockerimage
15+
disablesourceinput: true
16+
spec:
17+
image: docker.io/grafana/alloy
18+
tag: '{{ source "alloy-version" }}'
19+
20+
targets:
21+
update-alloy-image-version-in-env:
22+
kind: "file"
23+
sourceid: alloy-version
24+
spec:
25+
files:
26+
- docker-compose/common/config/.env
27+
matchpattern: 'ALLOY_IMAGE=grafana/alloy:.*'
28+
replacepattern: 'ALLOY_IMAGE=grafana/alloy:{{ source "alloy-version" }}'
29+
update-alloy-image-version-in-compose-include:
30+
kind: yaml
31+
sourceid: alloy-version
32+
transformers:
33+
- addprefix: "${ALLOY_IMAGE:-docker.io/grafana/alloy:"
34+
- addsuffix: "}"
35+
spec:
36+
file: docker-compose/common/compose-include/alloy.yaml
37+
key: $.services.alloy.image
38+

‎.github/updatecli.d/docker-image/update-grafana-image.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Update grafana image versions
2+
3+
sources:
4+
grafana-version:
5+
kind: dockerimage
6+
spec:
7+
image: docker.io/grafana/grafana
8+
versionfilter:
9+
kind: semver
10+
pattern: "~11.x"
11+
12+
conditions:
13+
check-grafana-image:
14+
kind: dockerimage
15+
disablesourceinput: true
16+
spec:
17+
image: docker.io/grafana/grafana
18+
tag: '{{ source "grafana-version" }}'
19+
20+
targets:
21+
update-grafana-image-version-in-env:
22+
kind: "file"
23+
sourceid: grafana-version
24+
spec:
25+
files:
26+
- docker-compose/common/config/.env
27+
matchpattern: 'GRAFANA_IMAGE=grafana/grafana:.*'
28+
replacepattern: 'GRAFANA_IMAGE=grafana/grafana:{{ source "grafana-version" }}'
29+
30+
update-grafana-image-version-in-compose-include:
31+
kind: yaml
32+
sourceid: grafana-version
33+
transformers:
34+
- addprefix: "${GRAFANA_IMAGE:-docker.io/grafana/grafana:"
35+
- addsuffix: "}"
36+
spec:
37+
file: docker-compose/common/compose-include/grafana.yaml
38+
key: $.services.grafana.image

‎.github/updatecli.d/docker-image/update-loki-image.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Update loki image versions
2+
3+
sources:
4+
loki-version:
5+
kind: dockerimage
6+
spec:
7+
image: docker.io/grafana/loki
8+
versionfilter:
9+
kind: semver
10+
pattern: "~3.x"
11+
12+
conditions:
13+
check-loki-image:
14+
kind: dockerimage
15+
disablesourceinput: true
16+
spec:
17+
image: docker.io/grafana/loki
18+
tag: '{{ source "loki-version" }}'
19+
20+
targets:
21+
update-loki-image-version-in-env:
22+
kind: "file"
23+
sourceid: loki-version
24+
spec:
25+
files:
26+
- docker-compose/common/config/.env
27+
matchpattern: 'LOKI_IMAGE=grafana/loki:.*'
28+
replacepattern: 'LOKI_IMAGE=grafana/loki:{{ source "loki-version" }}'
29+
30+
update-loki-image-version-in-compose-include:
31+
kind: yaml
32+
sourceid: loki-version
33+
transformers:
34+
- addprefix: "${LOKI_IMAGE:-docker.io/grafana/loki:"
35+
- addsuffix: "}"
36+
spec:
37+
file: docker-compose/common/compose-include/loki.yaml
38+
key: $.services.loki.image
39+
40+
update-loki-image-version-in-all-in-one-mode:
41+
kind: yaml
42+
sourceid: loki-version
43+
transformers:
44+
- addprefix: "${LOKI_IMAGE:-docker.io/grafana/loki:"
45+
- addsuffix: "}"
46+
spec:
47+
file: docker-compose/monolithic-mode/all-in-one/compose.yaml
48+
key: $.services.loki.image
49+
50+
update-loki-image-version-in-read-write-mode:
51+
kind: yaml
52+
sourceid: loki-version
53+
transformers:
54+
- addprefix: "&lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:"
55+
- addsuffix: "}"
56+
spec:
57+
file: docker-compose/read-write-mode/logs/compose.yaml
58+
key: $.services.loki-read.image
59+
60+
update-loki-image-version-in-microservices-mode:
61+
kind: yaml
62+
sourceid: loki-version
63+
transformers:
64+
- addprefix: "&lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:"
65+
- addsuffix: "}"
66+
spec:
67+
file: docker-compose/microservices-mode/logs/compose.yaml
68+
key: $.services.distributor.image

‎.github/updatecli.d/update-mimir-image.yaml‎ renamed to ‎.github/updatecli.d/docker-image/update-mimir-image.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ targets:
7272
file: docker-compose/common/compose-include/mimir.yaml
7373
key: $.services.mimirtool.image
7474

75-
update-mimir-image-version-in-all-in-one-mode-metrics:
75+
update-mimir-image-version-in-all-in-one-mode:
7676
kind: yaml
7777
sourceid: mimir-version
7878
transformers:
@@ -82,7 +82,7 @@ targets:
8282
file: docker-compose/monolithic-mode/all-in-one/compose.yaml
8383
key: $.services.mimir.image
8484

85-
update-mimirtool-image-version-in-all-in-one-mode-metrics:
85+
update-mimirtool-image-version-in-all-in-one-mode:
8686
kind: yaml
8787
sourceid: mimirtool-version
8888
transformers:
@@ -92,7 +92,7 @@ targets:
9292
file: docker-compose/monolithic-mode/all-in-one/compose.yaml
9393
key: $.services.mimirtool.image
9494

95-
update-mimir-image-version-in-read-write-mode-metrics:
95+
update-mimir-image-version-in-read-write-mode:
9696
kind: yaml
9797
sourceid: mimir-version
9898
transformers:
@@ -102,7 +102,7 @@ targets:
102102
file: docker-compose/read-write-mode/metrics/compose.yaml
103103
key: $.services.mimir-backend.image
104104

105-
update-mimirtool-image-version-in-read-write-mode-metrics:
105+
update-mimirtool-image-version-in-read-write-mode:
106106
kind: yaml
107107
sourceid: mimirtool-version
108108
transformers:
@@ -112,7 +112,7 @@ targets:
112112
file: docker-compose/read-write-mode/metrics/compose.yaml
113113
key: $.services.mimirtool.image
114114

115-
update-mimir-image-version-in-microservices-mode-metrics:
115+
update-mimir-image-version-in-microservices-mode:
116116
kind: yaml
117117
sourceid: mimir-version
118118
transformers:
@@ -122,7 +122,7 @@ targets:
122122
file: docker-compose/microservices-mode/metrics/compose.yaml
123123
key: $.services.distributor.image
124124

125-
update-mimirtool-image-version-in-microservices-mode-metrics:
125+
update-mimirtool-image-version-in-microservices-mode:
126126
kind: yaml
127127
sourceid: mimirtool-version
128128
transformers:

‎.github/updatecli.d/docker-image/update-tempo-image.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Update tempo image versions
2+
3+
sources:
4+
tempo-version:
5+
kind: dockerimage
6+
spec:
7+
image: docker.io/grafana/tempo
8+
versionfilter:
9+
kind: semver
10+
pattern: "~2.x"
11+
12+
conditions:
13+
check-tempo-image:
14+
kind: dockerimage
15+
disablesourceinput: true
16+
spec:
17+
image: docker.io/grafana/tempo
18+
tag: '{{ source "tempo-version" }}'
19+
20+
targets:
21+
update-tempo-image-version-in-env:
22+
kind: "file"
23+
sourceid: tempo-version
24+
spec:
25+
files:
26+
- docker-compose/common/config/.env
27+
matchpattern: 'TEMPO_IMAGE=grafana/tempo:.*'
28+
replacepattern: 'TEMPO_IMAGE=grafana/tempo:{{ source "tempo-version" }}'
29+
30+
update-tempo-image-version-in-compose-include:
31+
kind: yaml
32+
sourceid: tempo-version
33+
transformers:
34+
- addprefix: "${TEMPO_IMAGE:-docker.io/grafana/tempo:"
35+
- addsuffix: "}"
36+
spec:
37+
file: docker-compose/common/compose-include/tempo.yaml
38+
key: $.services.tempo.image
39+
40+
update-tempo-image-version-in-all-in-one-mode:
41+
kind: yaml
42+
sourceid: tempo-version
43+
transformers:
44+
- addprefix: "${TEMPO_IMAGE:-docker.io/grafana/tempo:"
45+
- addsuffix: "}"
46+
spec:
47+
file: docker-compose/monolithic-mode/all-in-one/compose.yaml
48+
key: $.services.tempo.image
49+
50+
update-tempo-image-version-in-microservices-mode:
51+
kind: yaml
52+
sourceid: tempo-version
53+
transformers:
54+
- addprefix: "&tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:"
55+
- addsuffix: "}"
56+
spec:
57+
file: docker-compose/microservices-mode/traces/compose.yaml
58+
key: $.services.distributor.image

‎.github/updatecli.d/update-docker-image.yaml‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)