Remove image build --from-image; doctor treats catalog images as OK
The `image build` flow spun up a transient Firecracker VM, SSHed in, and ran a large bash provisioning script to derive a new managed image from an existing one. It overlapped heavily with the golden- image Dockerfile flow (same mise/docker/tmux/opencode install logic duplicated in Go as `imagemgr.BuildProvisionScript`) and had far more machinery: async op state, RPC begin/status/cancel, webui form + operation page, preflight checks, API types, tests. For custom images, writing a Dockerfile is simpler and more reproducible. Removed end-to-end: - CLI `image build` subcommand + `absolutizeImageBuildPaths`. - Daemon: BuildImage method, imagebuild.go (transient-VM orchestration), image_build_ops.go (async begin/status/cancel), imagemgr/build.go (the 247-line provisioning script generator and all its append* helpers), validateImageBuildPrereqs + addImageBuildPrereqs. - RPC dispatches for image.build / .begin / .status / .cancel. - opstate registry `imageBuildOps`, daemon seam `imageBuild`, background pruner call. - API types: ImageBuildParams, ImageBuildOperation, ImageBuildBeginResult, ImageBuildStatusParams, ImageBuildStatusResult; model type ImageBuildRequest. - Web UI: Backend interface methods, handlers, form, routes, template branches (images.html build form, operation.html build branch, dashboard.html Build button). - Tests that directly exercised BuildImage. Doctor polish (task C): - Drop the "image build" preflight section entirely (its raison d'être is gone). - Default-image check now accepts "not local but in imagecat" as OK: vm create auto-pulls on first use. Only flag when the image is neither locally registered nor in the catalog. Net: 24 files touched, 1,373 lines deleted, 25 added. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
ace4782fce
commit
ac7974f5b9
24 changed files with 25 additions and 1398 deletions
|
|
@ -43,8 +43,6 @@ type Backend interface {
|
|||
PortsVM(context.Context, string) (api.VMPortsResult, error)
|
||||
ListImages(context.Context) ([]model.Image, error)
|
||||
FindImage(context.Context, string) (model.Image, error)
|
||||
BeginImageBuild(context.Context, api.ImageBuildParams) (api.ImageBuildOperation, error)
|
||||
ImageBuildStatus(context.Context, string) (api.ImageBuildOperation, error)
|
||||
RegisterImage(context.Context, api.ImageRegisterParams) (model.Image, error)
|
||||
PromoteImage(context.Context, string) (model.Image, error)
|
||||
DeleteImage(context.Context, string) (model.Image, error)
|
||||
|
|
@ -84,16 +82,6 @@ type vmSetForm struct {
|
|||
NATEnabled bool
|
||||
}
|
||||
|
||||
type imageBuildForm struct {
|
||||
Name string
|
||||
FromImage string
|
||||
Size string
|
||||
KernelPath string
|
||||
InitrdPath string
|
||||
ModulesDir string
|
||||
Docker bool
|
||||
}
|
||||
|
||||
type imageRegisterForm struct {
|
||||
Name string
|
||||
RootfsPath string
|
||||
|
|
@ -126,11 +114,9 @@ type pageData struct {
|
|||
Images []model.Image
|
||||
Image model.Image
|
||||
ImageUsers int
|
||||
ImageBuildForm imageBuildForm
|
||||
ImageRegisterForm imageRegisterForm
|
||||
LogText string
|
||||
VMCreateOperation *api.VMCreateOperation
|
||||
ImageBuildOperation *api.ImageBuildOperation
|
||||
OperationStatusURL string
|
||||
OperationSuccessURL string
|
||||
OperationLogPath string
|
||||
|
|
@ -197,17 +183,13 @@ func (s *Server) registerRoutes(mux *http.ServeMux) {
|
|||
mux.HandleFunc("POST /vms/{id}/delete", s.wrap(s.handleVMDelete))
|
||||
mux.HandleFunc("POST /vms/{id}/set", s.wrap(s.handleVMSet))
|
||||
mux.HandleFunc("GET /images", s.wrap(s.handleImageList))
|
||||
mux.HandleFunc("GET /images/build", s.wrap(s.handleImageBuildForm))
|
||||
mux.HandleFunc("POST /images/build", s.wrap(s.handleImageBuild))
|
||||
mux.HandleFunc("GET /images/register", s.wrap(s.handleImageRegisterForm))
|
||||
mux.HandleFunc("POST /images/register", s.wrap(s.handleImageRegister))
|
||||
mux.HandleFunc("GET /images/{id}", s.wrap(s.handleImageShow))
|
||||
mux.HandleFunc("POST /images/{id}/promote", s.wrap(s.handleImagePromote))
|
||||
mux.HandleFunc("POST /images/{id}/delete", s.wrap(s.handleImageDelete))
|
||||
mux.HandleFunc("GET /operations/vm-create/{id}", s.wrap(s.handleVMCreateOperationPage))
|
||||
mux.HandleFunc("GET /operations/image-build/{id}", s.wrap(s.handleImageBuildOperationPage))
|
||||
mux.HandleFunc("GET /api/operations/vm-create/{id}", s.wrap(s.handleVMCreateOperationAPI))
|
||||
mux.HandleFunc("GET /api/operations/image-build/{id}", s.wrap(s.handleImageBuildOperationAPI))
|
||||
mux.HandleFunc("GET /api/fs", s.wrap(s.handleFSAPI))
|
||||
}
|
||||
|
||||
|
|
@ -522,42 +504,6 @@ func (s *Server) handleImageList(w http.ResponseWriter, r *http.Request) error {
|
|||
})
|
||||
}
|
||||
|
||||
func (s *Server) handleImageBuildForm(w http.ResponseWriter, r *http.Request) error {
|
||||
return s.renderImageBuildPage(w, r, imageBuildForm{}, "")
|
||||
}
|
||||
|
||||
func (s *Server) renderImageBuildPage(w http.ResponseWriter, r *http.Request, form imageBuildForm, formErr string) error {
|
||||
return s.renderPage(w, r, http.StatusOK, "Build Image", "image_build_content", func(data *pageData) error {
|
||||
data.Section = "images"
|
||||
data.ImageBuildForm = form
|
||||
data.ErrorMessage = formErr
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Server) handleImageBuild(w http.ResponseWriter, r *http.Request) error {
|
||||
if err := s.verifyPOST(w, r); err != nil {
|
||||
return err
|
||||
}
|
||||
allowed, err := s.requireMutationAllowed(r.Context())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
form, params, err := s.parseImageBuildForm(r)
|
||||
if err != nil {
|
||||
return s.renderImageBuildPage(w, r, form, err.Error())
|
||||
}
|
||||
if !allowed {
|
||||
return s.renderImageBuildPage(w, r, form, "mutating actions are unavailable until `sudo -v` succeeds")
|
||||
}
|
||||
op, err := s.backend.BeginImageBuild(r.Context(), params)
|
||||
if err != nil {
|
||||
return s.renderImageBuildPage(w, r, form, err.Error())
|
||||
}
|
||||
http.Redirect(w, r, "/operations/image-build/"+url.PathEscape(op.ID), http.StatusSeeOther)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Server) handleImageRegisterForm(w http.ResponseWriter, r *http.Request) error {
|
||||
return s.renderImageRegisterPage(w, r, imageRegisterForm{}, "")
|
||||
}
|
||||
|
|
@ -683,24 +629,6 @@ func (s *Server) handleVMCreateOperationPage(w http.ResponseWriter, r *http.Requ
|
|||
})
|
||||
}
|
||||
|
||||
func (s *Server) handleImageBuildOperationPage(w http.ResponseWriter, r *http.Request) error {
|
||||
op, err := s.backend.ImageBuildStatus(r.Context(), r.PathValue("id"))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return s.renderPage(w, r, http.StatusOK, "Building Image", "operation_content", func(data *pageData) error {
|
||||
data.Section = "images"
|
||||
data.OperationKind = "image"
|
||||
data.ImageBuildOperation = &op
|
||||
data.OperationStatusURL = "/api/operations/image-build/" + url.PathEscape(op.ID)
|
||||
if op.ImageID != "" {
|
||||
data.OperationSuccessURL = "/images/" + url.PathEscape(op.ImageID)
|
||||
}
|
||||
data.OperationLogPath = op.BuildLogPath
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Server) handleVMCreateOperationAPI(w http.ResponseWriter, r *http.Request) error {
|
||||
op, err := s.backend.VMCreateStatus(r.Context(), r.PathValue("id"))
|
||||
if err != nil {
|
||||
|
|
@ -709,14 +637,6 @@ func (s *Server) handleVMCreateOperationAPI(w http.ResponseWriter, r *http.Reque
|
|||
return writeJSON(w, api.VMCreateStatusResult{Operation: op})
|
||||
}
|
||||
|
||||
func (s *Server) handleImageBuildOperationAPI(w http.ResponseWriter, r *http.Request) error {
|
||||
op, err := s.backend.ImageBuildStatus(r.Context(), r.PathValue("id"))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return writeJSON(w, api.ImageBuildStatusResult{Operation: op})
|
||||
}
|
||||
|
||||
func (s *Server) handleFSAPI(w http.ResponseWriter, r *http.Request) error {
|
||||
path := strings.TrimSpace(r.URL.Query().Get("path"))
|
||||
if path == "" {
|
||||
|
|
@ -977,31 +897,6 @@ func (s *Server) parseVMSetForm(r *http.Request, vm model.VMRecord) (api.VMSetPa
|
|||
return params, nil
|
||||
}
|
||||
|
||||
func (s *Server) parseImageBuildForm(r *http.Request) (imageBuildForm, api.ImageBuildParams, error) {
|
||||
if err := s.verifyPOST(nilResponseWriter{}, r); err != nil {
|
||||
return imageBuildForm{}, api.ImageBuildParams{}, err
|
||||
}
|
||||
form := imageBuildForm{
|
||||
Name: strings.TrimSpace(r.FormValue("name")),
|
||||
FromImage: strings.TrimSpace(r.FormValue("from_image")),
|
||||
Size: strings.TrimSpace(r.FormValue("size")),
|
||||
KernelPath: strings.TrimSpace(r.FormValue("kernel_path")),
|
||||
InitrdPath: strings.TrimSpace(r.FormValue("initrd_path")),
|
||||
ModulesDir: strings.TrimSpace(r.FormValue("modules_dir")),
|
||||
Docker: r.FormValue("docker") == "on",
|
||||
}
|
||||
params := api.ImageBuildParams{
|
||||
Name: form.Name,
|
||||
FromImage: form.FromImage,
|
||||
Size: form.Size,
|
||||
KernelPath: form.KernelPath,
|
||||
InitrdPath: form.InitrdPath,
|
||||
ModulesDir: form.ModulesDir,
|
||||
Docker: form.Docker,
|
||||
}
|
||||
return form, params, nil
|
||||
}
|
||||
|
||||
func (s *Server) parseImageRegisterForm(r *http.Request) (imageRegisterForm, api.ImageRegisterParams, error) {
|
||||
if err := s.verifyPOST(nilResponseWriter{}, r); err != nil {
|
||||
return imageRegisterForm{}, api.ImageRegisterParams{}, err
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue