Fix bake file (missed a conflict needing resolution)

mikesir87 · mikesir87 · commit c4ca87a0c79f · 2025-09-09T13:16:54.000-04:00
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -82,7 +82,6 @@ target "workspace-base" {
   }
 }
 
-<<<<<<< HEAD
 target "workspace-node" {
   inherits = ["_common"]
   context = "./components/workspace/node"
@@ -101,12 +100,12 @@ target "workspace-java" {
   contexts = {
     labspace-workspace-base = "target:workspace-base"
   }
-=======
+}
+
 target "host-port-republisher" {
   inherits = ["_common"]
   context = "./components/host-port-republisher"
   tags = tags(IMAGE_NAMESPACE, "labspace-host-port-republisher", IMAGE_TAG)
->>>>>>> parent of 83fbc11 (Move host port republishing from separate service to support extension)
 }
 
 target "labspace-cleaner" {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ target "workspace-base" {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`-<<<<<<< HEAD`
`86`	`85`	`target "workspace-node" {`
`87`	`86`	`inherits = ["_common"]`
`88`	`87`	`context = "./components/workspace/node"`
`@@ -101,12 +100,12 @@ target "workspace-java" {`
`101`	`100`	`contexts = {`
`102`	`101`	`labspace-workspace-base = "target:workspace-base"`
`103`	`102`	`}`
`104`		`-=======`
	`103`	`+}`
	`104`	`+`
`105`	`105`	`target "host-port-republisher" {`
`106`	`106`	`inherits = ["_common"]`
`107`	`107`	`context = "./components/host-port-republisher"`
`108`	`108`	`tags = tags(IMAGE_NAMESPACE, "labspace-host-port-republisher", IMAGE_TAG)`
`109`		`->>>>>>> parent of 83fbc11 (Move host port republishing from separate service to support extension)`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`target "labspace-cleaner" {`