Skip to content

Commit

Permalink
Default to image output
Browse files Browse the repository at this point in the history
  • Loading branch information
ianpittwood committed Apr 5, 2024
1 parent 0a1faf2 commit a7b55d3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions content/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ target "base" {
"docker.io.io/rstudio/content-base:r${builds.r}-py${builds.py}-${builds.os_alt}",
]
output = [
"type=cacheonly",
"type=image",
]

dockerfile = "Dockerfile.${builds.os}"
Expand All @@ -64,7 +64,7 @@ target "pro" {
"docker.io.io/rstudio/content-pro:r${builds.r}-py${builds.py}-${builds.os_alt}",
]
output = [
"type=cacheonly",
"type=image",
]

contexts = {
Expand Down
10 changes: 2 additions & 8 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ target "base" {
labels = {
"maintainer" = "Posit Docker <[email protected]>"
}
output = ["type=cacheonly"]
output = ["type=image"]
}

target "product-base" {
Expand All @@ -233,9 +233,6 @@ target "product-base" {
"ghcr.io/rstudio/product-base:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
"docker.io/rstudio/product-base:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
]
output = [
"type=cacheonly",
]

dockerfile = "Dockerfile.${builds.os}"
context = "product/base"
Expand Down Expand Up @@ -274,9 +271,6 @@ target "product-base-pro" {
"ghcr.io/rstudio/product-base-pro:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
"docker.io/rstudio/product-base-pro:${builds.os}-r${builds.r_primary}_${builds.r_alternate}-py${builds.py_primary}_${builds.py_alternate}",
]
output = [
"type=cacheonly",
]

dockerfile = "Dockerfile.${builds.os}"
context = "product/pro"
Expand Down Expand Up @@ -363,7 +357,7 @@ target "connect" {
]
# We output Connect to OCI so it can be pulled in for testing later on.
output = [
"type=cacheonly",
"type=image",
"type=oci,tar=false,dest=./.out/connect-${builds.os}-r${replace(builds.r_primary, ".", "-")}_${replace(builds.r_alternate, ".", "-")}-py${replace(builds.py_primary, ".", "-")}_${replace(builds.py_alternate, ".", "-")}"
]

Expand Down

0 comments on commit a7b55d3

Please sign in to comment.