Merge branch 'main' into dev

rstudio · May 7, 2024 · 34fcbf9 · 34fcbf9
2 parents 24d607b + 71ba641
commit 34fcbf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml
@@ -304,7 +304,7 @@ jobs:
       cancel-in-progress: true
 
     env:
-      target: waml-images
+      target: workbench-for-microsoft-azure-ml
       GIT_SHA: ${{ needs.setup.outputs.GIT_SHA }}
 
     steps:

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -224,14 +224,6 @@ group "content-images" {
     ]
 }
 
-group "waml-images" {
-    targets = [
-        "build-workbench-for-microsoft-azure-ml",
-        "scan-workbench-for-microsoft-azure-ml",
-        "workbench-for-microsoft-azure-ml",
-    ]
-}
-
 ### Base Image targets ###
 target "base" {
     labels = {
@@ -364,7 +356,7 @@ target "content-base" {
         "ghcr.io/rstudio/content-base:r${builds.r}-py${builds.py}-${builds.os}",
         "ghcr.io/rstudio/content-base:r${builds.r}-py${builds.py}-${builds.os_alt}",
         "docker.io/rstudio/content-base:r${builds.r}-py${builds.py}-${builds.os}",
-        "docker.io.io/rstudio/content-base:r${builds.r}-py${builds.py}-${builds.os_alt}",
+        "docker.io/rstudio/content-base:r${builds.r}-py${builds.py}-${builds.os_alt}",
     ]
 
     dockerfile = "Dockerfile.${builds.os}"
@@ -386,7 +378,7 @@ target "content-pro" {
         "ghcr.io/rstudio/content-pro:r${builds.r}-py${builds.py}-${builds.os}",
         "ghcr.io/rstudio/content-pro:r${builds.r}-py${builds.py}-${builds.os_alt}",
         "docker.io/rstudio/content-pro:r${builds.r}-py${builds.py}-${builds.os}",
-        "docker.io.io/rstudio/content-pro:r${builds.r}-py${builds.py}-${builds.os_alt}",
+        "docker.io/rstudio/content-pro:r${builds.r}-py${builds.py}-${builds.os_alt}",
     ]
 
     contexts = {