fix

walnuts1018 · walnuts1018 · commit 4ec1a3530612 · 2024-04-16T02:09:29.000+09:00
diff --git a/internal/controller/codeserver_controller.go b/internal/controller/codeserver_controller.go
@@ -288,7 +288,11 @@ func (r *CodeServerReconciler) reconcileDeployment(ctx context.Context, codeServ
 		)
 	}
 
-	command := fmt.Sprintf("%s && /usr/bin/entrypoint.sh --bind-addr 0.0.0.0:%d", codeServer.Spec.InitCommand, codeServer.Spec.ContainerPort)
+	command := fmt.Sprintf("/usr/bin/entrypoint.sh --bind-addr 0.0.0.0:%d", codeServer.Spec.ContainerPort)
+	if codeServer.Spec.InitCommand != "" {
+		command = fmt.Sprintf("%s && %s", codeServer.Spec.InitCommand, command)
+	}
+
 	if _, ok := codeServer.Spec.InitPlugins["git"]; ok {
 		command = fmt.Sprintf("%s /home/coder/work", command)
 	}

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,11 @@ func (r *CodeServerReconciler) reconcileDeployment(ctx context.Context, codeServ`
`288`	`288`	`)`
`289`	`289`	`}`
`290`	`290`
`291`		`- command := fmt.Sprintf("%s && /usr/bin/entrypoint.sh --bind-addr 0.0.0.0:%d", codeServer.Spec.InitCommand, codeServer.Spec.ContainerPort)`
	`291`	`+ command := fmt.Sprintf("/usr/bin/entrypoint.sh --bind-addr 0.0.0.0:%d", codeServer.Spec.ContainerPort)`
	`292`	`+ if codeServer.Spec.InitCommand != "" {`
	`293`	`+ command = fmt.Sprintf("%s && %s", codeServer.Spec.InitCommand, command)`
	`294`	`+ }`
	`295`	`+`
`292`	`296`	`if _, ok := codeServer.Spec.InitPlugins["git"]; ok {`
`293`	`297`	`command = fmt.Sprintf("%s /home/coder/work", command)`
`294`	`298`	`}`