Skip to content

Commit 1c675db

Browse files
eitsupieitsupi
committed
refactor(bakefiles): move some fields to the template side
1 parent 06e8498 commit 1c675db

8 files changed

+239
-210
lines changed

‎bakefiles/4.2.3.docker-bake.json

+51-43
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33
{
44
"default": [
55
{
6-
"targets": ["r-ver", "rstudio", "tidyverse", "shiny", "shiny-verse", "verse", "geospatial"]
6+
"targets": [
7+
"r-ver",
8+
"rstudio",
9+
"tidyverse",
10+
"shiny",
11+
"shiny-verse",
12+
"verse",
13+
"geospatial"
14+
]
715
}
816
]
917
}
@@ -21,19 +29,19 @@
2129
"org.opencontainers.image.vendor": "Rocker Project",
2230
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
2331
},
24-
"tags": [
25-
"docker.io/rocker/r-ver:4.2.3",
26-
"ghcr.io/rocker-org/r-ver:4.2.3",
27-
"docker.io/rocker/r-ver:4.2",
28-
"ghcr.io/rocker-org/r-ver:4.2"
29-
],
3032
"platforms": [
3133
"linux/amd64",
3234
"linux/arm64"
3335
],
3436
"cache-to": [
3537
"type=inline"
3638
],
39+
"tags": [
40+
"docker.io/rocker/r-ver:4.2.3",
41+
"ghcr.io/rocker-org/r-ver:4.2.3",
42+
"docker.io/rocker/r-ver:4.2",
43+
"ghcr.io/rocker-org/r-ver:4.2"
44+
],
3745
"cache-from": [
3846
"docker.io/rocker/r-ver:4.2.3",
3947
"ghcr.io/rocker-org/r-ver:4.2.3",
@@ -77,19 +85,19 @@
7785
"org.opencontainers.image.vendor": "Rocker Project",
7886
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
7987
},
80-
"tags": [
81-
"docker.io/rocker/rstudio:4.2.3",
82-
"ghcr.io/rocker-org/rstudio:4.2.3",
83-
"docker.io/rocker/rstudio:4.2",
84-
"ghcr.io/rocker-org/rstudio:4.2"
85-
],
8688
"platforms": [
8789
"linux/amd64",
8890
"linux/arm64"
8991
],
9092
"cache-to": [
9193
"type=inline"
9294
],
95+
"tags": [
96+
"docker.io/rocker/rstudio:4.2.3",
97+
"ghcr.io/rocker-org/rstudio:4.2.3",
98+
"docker.io/rocker/rstudio:4.2",
99+
"ghcr.io/rocker-org/rstudio:4.2"
100+
],
93101
"cache-from": [
94102
"docker.io/rocker/r-ver:4.2.3",
95103
"ghcr.io/rocker-org/r-ver:4.2.3",
@@ -133,18 +141,18 @@
133141
"org.opencontainers.image.vendor": "Rocker Project",
134142
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
135143
},
144+
"platforms": [
145+
"linux/amd64"
146+
],
147+
"cache-to": [
148+
"type=inline"
149+
],
136150
"tags": [
137151
"docker.io/rocker/tidyverse:4.2.3",
138152
"ghcr.io/rocker-org/tidyverse:4.2.3",
139153
"docker.io/rocker/tidyverse:4.2",
140154
"ghcr.io/rocker-org/tidyverse:4.2"
141155
],
142-
"platforms": [
143-
"linux/arm64"
144-
],
145-
"cache-to": [
146-
"type=inline"
147-
],
148156
"cache-from": [
149157
"docker.io/rocker/r-ver:4.2.3",
150158
"ghcr.io/rocker-org/r-ver:4.2.3",
@@ -188,18 +196,18 @@
188196
"org.opencontainers.image.vendor": "Rocker Project",
189197
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
190198
},
199+
"platforms": [
200+
"linux/amd64"
201+
],
202+
"cache-to": [
203+
"type=inline"
204+
],
191205
"tags": [
192206
"docker.io/rocker/verse:4.2.3",
193207
"ghcr.io/rocker-org/verse:4.2.3",
194208
"docker.io/rocker/verse:4.2",
195209
"ghcr.io/rocker-org/verse:4.2"
196210
],
197-
"platforms": [
198-
"linux/arm64"
199-
],
200-
"cache-to": [
201-
"type=inline"
202-
],
203211
"cache-from": [
204212
"docker.io/rocker/r-ver:4.2.3",
205213
"ghcr.io/rocker-org/r-ver:4.2.3",
@@ -243,18 +251,18 @@
243251
"org.opencontainers.image.vendor": "Rocker Project",
244252
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
245253
},
254+
"platforms": [
255+
"linux/amd64"
256+
],
257+
"cache-to": [
258+
"type=inline"
259+
],
246260
"tags": [
247261
"docker.io/rocker/geospatial:4.2.3",
248262
"ghcr.io/rocker-org/geospatial:4.2.3",
249263
"docker.io/rocker/geospatial:4.2",
250264
"ghcr.io/rocker-org/geospatial:4.2"
251265
],
252-
"platforms": [
253-
"linux/arm64"
254-
],
255-
"cache-to": [
256-
"type=inline"
257-
],
258266
"cache-from": [
259267
"docker.io/rocker/r-ver:4.2.3",
260268
"ghcr.io/rocker-org/r-ver:4.2.3",
@@ -298,18 +306,18 @@
298306
"org.opencontainers.image.vendor": "Rocker Project",
299307
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
300308
},
309+
"platforms": [
310+
"linux/amd64"
311+
],
312+
"cache-to": [
313+
"type=inline"
314+
],
301315
"tags": [
302316
"docker.io/rocker/shiny:4.2.3",
303317
"ghcr.io/rocker-org/shiny:4.2.3",
304318
"docker.io/rocker/shiny:4.2",
305319
"ghcr.io/rocker-org/shiny:4.2"
306320
],
307-
"platforms": [
308-
"linux/arm64"
309-
],
310-
"cache-to": [
311-
"type=inline"
312-
],
313321
"cache-from": [
314322
"docker.io/rocker/r-ver:4.2.3",
315323
"ghcr.io/rocker-org/r-ver:4.2.3",
@@ -353,18 +361,18 @@
353361
"org.opencontainers.image.vendor": "Rocker Project",
354362
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
355363
},
364+
"platforms": [
365+
"linux/amd64"
366+
],
367+
"cache-to": [
368+
"type=inline"
369+
],
356370
"tags": [
357371
"docker.io/rocker/shiny-verse:4.2.3",
358372
"ghcr.io/rocker-org/shiny-verse:4.2.3",
359373
"docker.io/rocker/shiny-verse:4.2",
360374
"ghcr.io/rocker-org/shiny-verse:4.2"
361375
],
362-
"platforms": [
363-
"linux/arm64"
364-
],
365-
"cache-to": [
366-
"type=inline"
367-
],
368376
"cache-from": [
369377
"docker.io/rocker/r-ver:4.2.3",
370378
"ghcr.io/rocker-org/r-ver:4.2.3",

‎bakefiles/4.3.2.docker-bake.json

+42-34
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33
{
44
"default": [
55
{
6-
"targets": ["r-ver", "rstudio", "tidyverse", "shiny", "shiny-verse", "verse", "geospatial"]
6+
"targets": [
7+
"r-ver",
8+
"rstudio",
9+
"tidyverse",
10+
"shiny",
11+
"shiny-verse",
12+
"verse",
13+
"geospatial"
14+
]
715
}
816
]
917
}
@@ -21,17 +29,17 @@
2129
"org.opencontainers.image.vendor": "Rocker Project",
2230
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
2331
},
24-
"tags": [
25-
"docker.io/rocker/r-ver:4.3.2",
26-
"ghcr.io/rocker-org/r-ver:4.3.2"
27-
],
2832
"platforms": [
2933
"linux/amd64",
3034
"linux/arm64"
3135
],
3236
"cache-to": [
3337
"type=inline"
3438
],
39+
"tags": [
40+
"docker.io/rocker/r-ver:4.3.2",
41+
"ghcr.io/rocker-org/r-ver:4.3.2"
42+
],
3543
"cache-from": [
3644
"docker.io/rocker/r-ver:4.3.2",
3745
"ghcr.io/rocker-org/r-ver:4.3.2",
@@ -61,17 +69,17 @@
6169
"org.opencontainers.image.vendor": "Rocker Project",
6270
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
6371
},
64-
"tags": [
65-
"docker.io/rocker/rstudio:4.3.2",
66-
"ghcr.io/rocker-org/rstudio:4.3.2"
67-
],
6872
"platforms": [
6973
"linux/amd64",
7074
"linux/arm64"
7175
],
7276
"cache-to": [
7377
"type=inline"
7478
],
79+
"tags": [
80+
"docker.io/rocker/rstudio:4.3.2",
81+
"ghcr.io/rocker-org/rstudio:4.3.2"
82+
],
7583
"cache-from": [
7684
"docker.io/rocker/r-ver:4.3.2",
7785
"ghcr.io/rocker-org/r-ver:4.3.2",
@@ -101,16 +109,16 @@
101109
"org.opencontainers.image.vendor": "Rocker Project",
102110
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
103111
},
104-
"tags": [
105-
"docker.io/rocker/tidyverse:4.3.2",
106-
"ghcr.io/rocker-org/tidyverse:4.3.2"
107-
],
108112
"platforms": [
109-
"linux/arm64"
113+
"linux/amd64"
110114
],
111115
"cache-to": [
112116
"type=inline"
113117
],
118+
"tags": [
119+
"docker.io/rocker/tidyverse:4.3.2",
120+
"ghcr.io/rocker-org/tidyverse:4.3.2"
121+
],
114122
"cache-from": [
115123
"docker.io/rocker/r-ver:4.3.2",
116124
"ghcr.io/rocker-org/r-ver:4.3.2",
@@ -140,16 +148,16 @@
140148
"org.opencontainers.image.vendor": "Rocker Project",
141149
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
142150
},
143-
"tags": [
144-
"docker.io/rocker/verse:4.3.2",
145-
"ghcr.io/rocker-org/verse:4.3.2"
146-
],
147151
"platforms": [
148-
"linux/arm64"
152+
"linux/amd64"
149153
],
150154
"cache-to": [
151155
"type=inline"
152156
],
157+
"tags": [
158+
"docker.io/rocker/verse:4.3.2",
159+
"ghcr.io/rocker-org/verse:4.3.2"
160+
],
153161
"cache-from": [
154162
"docker.io/rocker/r-ver:4.3.2",
155163
"ghcr.io/rocker-org/r-ver:4.3.2",
@@ -179,16 +187,16 @@
179187
"org.opencontainers.image.vendor": "Rocker Project",
180188
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
181189
},
182-
"tags": [
183-
"docker.io/rocker/geospatial:4.3.2",
184-
"ghcr.io/rocker-org/geospatial:4.3.2"
185-
],
186190
"platforms": [
187-
"linux/arm64"
191+
"linux/amd64"
188192
],
189193
"cache-to": [
190194
"type=inline"
191195
],
196+
"tags": [
197+
"docker.io/rocker/geospatial:4.3.2",
198+
"ghcr.io/rocker-org/geospatial:4.3.2"
199+
],
192200
"cache-from": [
193201
"docker.io/rocker/r-ver:4.3.2",
194202
"ghcr.io/rocker-org/r-ver:4.3.2",
@@ -218,16 +226,16 @@
218226
"org.opencontainers.image.vendor": "Rocker Project",
219227
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
220228
},
221-
"tags": [
222-
"docker.io/rocker/shiny:4.3.2",
223-
"ghcr.io/rocker-org/shiny:4.3.2"
224-
],
225229
"platforms": [
226-
"linux/arm64"
230+
"linux/amd64"
227231
],
228232
"cache-to": [
229233
"type=inline"
230234
],
235+
"tags": [
236+
"docker.io/rocker/shiny:4.3.2",
237+
"ghcr.io/rocker-org/shiny:4.3.2"
238+
],
231239
"cache-from": [
232240
"docker.io/rocker/r-ver:4.3.2",
233241
"ghcr.io/rocker-org/r-ver:4.3.2",
@@ -257,16 +265,16 @@
257265
"org.opencontainers.image.vendor": "Rocker Project",
258266
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
259267
},
260-
"tags": [
261-
"docker.io/rocker/shiny-verse:4.3.2",
262-
"ghcr.io/rocker-org/shiny-verse:4.3.2"
263-
],
264268
"platforms": [
265-
"linux/arm64"
269+
"linux/amd64"
266270
],
267271
"cache-to": [
268272
"type=inline"
269273
],
274+
"tags": [
275+
"docker.io/rocker/shiny-verse:4.3.2",
276+
"ghcr.io/rocker-org/shiny-verse:4.3.2"
277+
],
270278
"cache-from": [
271279
"docker.io/rocker/r-ver:4.3.2",
272280
"ghcr.io/rocker-org/r-ver:4.3.2",

0 commit comments

Comments
 (0)