Skip to content

Commit

Permalink
refactor(bakefiles): move some fields to the template side
Browse files Browse the repository at this point in the history
  • Loading branch information
eitsupi committed Apr 24, 2024
1 parent 06e8498 commit 1c675db
Show file tree
Hide file tree
Showing 8 changed files with 239 additions and 210 deletions.
94 changes: 51 additions & 43 deletions bakefiles/4.2.3.docker-bake.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
{
"default": [
{
"targets": ["r-ver", "rstudio", "tidyverse", "shiny", "shiny-verse", "verse", "geospatial"]
"targets": [
"r-ver",
"rstudio",
"tidyverse",
"shiny",
"shiny-verse",
"verse",
"geospatial"
]
}
]
}
Expand All @@ -21,19 +29,19 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
"docker.io/rocker/r-ver:4.2",
"ghcr.io/rocker-org/r-ver:4.2"
],
"platforms": [
"linux/amd64",
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
"docker.io/rocker/r-ver:4.2",
"ghcr.io/rocker-org/r-ver:4.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
Expand Down Expand Up @@ -77,19 +85,19 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/rstudio:4.2.3",
"ghcr.io/rocker-org/rstudio:4.2.3",
"docker.io/rocker/rstudio:4.2",
"ghcr.io/rocker-org/rstudio:4.2"
],
"platforms": [
"linux/amd64",
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/rstudio:4.2.3",
"ghcr.io/rocker-org/rstudio:4.2.3",
"docker.io/rocker/rstudio:4.2",
"ghcr.io/rocker-org/rstudio:4.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
Expand Down Expand Up @@ -133,18 +141,18 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"platforms": [
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/tidyverse:4.2.3",
"ghcr.io/rocker-org/tidyverse:4.2.3",
"docker.io/rocker/tidyverse:4.2",
"ghcr.io/rocker-org/tidyverse:4.2"
],
"platforms": [
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"cache-from": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
Expand Down Expand Up @@ -188,18 +196,18 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"platforms": [
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/verse:4.2.3",
"ghcr.io/rocker-org/verse:4.2.3",
"docker.io/rocker/verse:4.2",
"ghcr.io/rocker-org/verse:4.2"
],
"platforms": [
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"cache-from": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
Expand Down Expand Up @@ -243,18 +251,18 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"platforms": [
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/geospatial:4.2.3",
"ghcr.io/rocker-org/geospatial:4.2.3",
"docker.io/rocker/geospatial:4.2",
"ghcr.io/rocker-org/geospatial:4.2"
],
"platforms": [
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"cache-from": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
Expand Down Expand Up @@ -298,18 +306,18 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"platforms": [
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/shiny:4.2.3",
"ghcr.io/rocker-org/shiny:4.2.3",
"docker.io/rocker/shiny:4.2",
"ghcr.io/rocker-org/shiny:4.2"
],
"platforms": [
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"cache-from": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
Expand Down Expand Up @@ -353,18 +361,18 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"platforms": [
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/shiny-verse:4.2.3",
"ghcr.io/rocker-org/shiny-verse:4.2.3",
"docker.io/rocker/shiny-verse:4.2",
"ghcr.io/rocker-org/shiny-verse:4.2"
],
"platforms": [
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"cache-from": [
"docker.io/rocker/r-ver:4.2.3",
"ghcr.io/rocker-org/r-ver:4.2.3",
Expand Down
76 changes: 42 additions & 34 deletions bakefiles/4.3.2.docker-bake.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
{
"default": [
{
"targets": ["r-ver", "rstudio", "tidyverse", "shiny", "shiny-verse", "verse", "geospatial"]
"targets": [
"r-ver",
"rstudio",
"tidyverse",
"shiny",
"shiny-verse",
"verse",
"geospatial"
]
}
]
}
Expand All @@ -21,17 +29,17 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2"
],
"platforms": [
"linux/amd64",
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2",
Expand Down Expand Up @@ -61,17 +69,17 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/rstudio:4.3.2",
"ghcr.io/rocker-org/rstudio:4.3.2"
],
"platforms": [
"linux/amd64",
"linux/arm64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/rstudio:4.3.2",
"ghcr.io/rocker-org/rstudio:4.3.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2",
Expand Down Expand Up @@ -101,16 +109,16 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/tidyverse:4.3.2",
"ghcr.io/rocker-org/tidyverse:4.3.2"
],
"platforms": [
"linux/arm64"
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/tidyverse:4.3.2",
"ghcr.io/rocker-org/tidyverse:4.3.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2",
Expand Down Expand Up @@ -140,16 +148,16 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/verse:4.3.2",
"ghcr.io/rocker-org/verse:4.3.2"
],
"platforms": [
"linux/arm64"
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/verse:4.3.2",
"ghcr.io/rocker-org/verse:4.3.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2",
Expand Down Expand Up @@ -179,16 +187,16 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/geospatial:4.3.2",
"ghcr.io/rocker-org/geospatial:4.3.2"
],
"platforms": [
"linux/arm64"
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/geospatial:4.3.2",
"ghcr.io/rocker-org/geospatial:4.3.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2",
Expand Down Expand Up @@ -218,16 +226,16 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/shiny:4.3.2",
"ghcr.io/rocker-org/shiny:4.3.2"
],
"platforms": [
"linux/arm64"
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/shiny:4.3.2",
"ghcr.io/rocker-org/shiny:4.3.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2",
Expand Down Expand Up @@ -257,16 +265,16 @@
"org.opencontainers.image.vendor": "Rocker Project",
"org.opencontainers.image.authors": "Carl Boettiger <[email protected]>"
},
"tags": [
"docker.io/rocker/shiny-verse:4.3.2",
"ghcr.io/rocker-org/shiny-verse:4.3.2"
],
"platforms": [
"linux/arm64"
"linux/amd64"
],
"cache-to": [
"type=inline"
],
"tags": [
"docker.io/rocker/shiny-verse:4.3.2",
"ghcr.io/rocker-org/shiny-verse:4.3.2"
],
"cache-from": [
"docker.io/rocker/r-ver:4.3.2",
"ghcr.io/rocker-org/r-ver:4.3.2",
Expand Down
Loading

0 comments on commit 1c675db

Please sign in to comment.