mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 07:41:27 +00:00
Tomas DvorakandDevin
912f6f5142
services.builder picks the build strategy per service: auto detects from repo contents (Dockerfile → railpack → nixpacks), explicit overrides force a builder, and static builds assets in a node stage then serves them from an nginx image (static_build_cmd/static_dir, port 80 default). - cpu_reserve/memory_reserve → Docker CPU shares + MemoryReservation; cpu/memory stay hard caps (NanoCPUs/Memory). Empty string clears. - app_settings.default_cpu/default_memory override service-create fallbacks; capacity_policy=block fails deploys whose requested memory exceeds node capacity (default warn logs via slog). - Resource specs are validated — "512mb" fails instead of silently dropping the limit. - Fixes: deployments.go hardcoded nixpacks (auto-detect was dead code); DockerfileBuilder passed the Dockerfile *path* as build-context content; BuildImage never drained the daemon stream so builds could abort and errors went unseen — stream is now consumed and errorDetail surfaced. - CLI: --builder/--cpu-reserve/--memory-reserve/--static-cmd/--static-dir on create+update; MCP args on services create/update; UI Build & Resources card; OpenAPI + llms.txt + CLI.md. Verified live: static build of a real repo → nginx image → deployed; reserves reach HostConfig (shares=256, MemoryReservation=128Mi); validation rejects bad specs; builder persists + clears. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
96 lines
2.5 KiB
Go
96 lines
2.5 KiB
Go
package build
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"containr/internal/docker"
|
|
"containr/internal/types"
|
|
)
|
|
|
|
// StaticBuilder produces an nginx-served image from a repo's built assets.
|
|
// STATIC_BUILD_CMD runs inside a node build stage; STATIC_DIR names the
|
|
// output directory copied into the nginx image. Both are overridable via
|
|
// build args so repos with non-node toolchains can swap the build image too.
|
|
type StaticBuilder struct {
|
|
dockerClient *docker.Client
|
|
}
|
|
|
|
func NewStaticBuilder(dockerClient *docker.Client) *StaticBuilder {
|
|
return &StaticBuilder{dockerClient: dockerClient}
|
|
}
|
|
|
|
const staticDockerfile = `ARG BUILD_IMAGE=node:20-alpine
|
|
FROM ${BUILD_IMAGE} AS assets
|
|
WORKDIR /app
|
|
COPY . .
|
|
ARG STATIC_BUILD_CMD
|
|
RUN sh -c "${STATIC_BUILD_CMD}"
|
|
|
|
FROM nginx:alpine
|
|
ARG STATIC_DIR=dist
|
|
COPY --from=assets /app/${STATIC_DIR} /usr/share/nginx/html
|
|
EXPOSE 80
|
|
CMD ["nginx", "-g", "daemon off;"]
|
|
`
|
|
|
|
func (s *StaticBuilder) Build(ctx context.Context, req *types.BuildRequest) (*types.BuildResponse, error) {
|
|
buildCmd := req.BuildCommand
|
|
if buildCmd == "" {
|
|
buildCmd = "npm ci && npm run build"
|
|
}
|
|
staticDir := req.BuildArgs["STATIC_DIR"]
|
|
if staticDir == "" {
|
|
staticDir = "dist"
|
|
}
|
|
|
|
buildArgs := map[string]*string{}
|
|
for k, v := range req.BuildArgs {
|
|
v := v
|
|
buildArgs[k] = &v
|
|
}
|
|
for k, v := range req.Environment {
|
|
v := v
|
|
buildArgs[k] = &v
|
|
}
|
|
buildArgs["STATIC_BUILD_CMD"] = &buildCmd
|
|
buildArgs["STATIC_DIR"] = &staticDir
|
|
|
|
imageName := fmt.Sprintf("%s:%s", req.ImageName, req.ImageTag)
|
|
buildCtx, err := createBuildContext(req.SourcePath, staticDockerfile)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to create build context: %w", err)
|
|
}
|
|
defer buildCtx.Close()
|
|
|
|
if _, err := s.dockerClient.BuildImage(ctx, buildCtx, docker.BuildOptions{
|
|
Dockerfile: "Dockerfile",
|
|
Tags: []string{imageName},
|
|
BuildArgs: buildArgs,
|
|
NoCache: req.NoCache,
|
|
Remove: true,
|
|
}); err != nil {
|
|
return nil, fmt.Errorf("failed to build static image: %w", err)
|
|
}
|
|
|
|
if req.RegistryURL != "" {
|
|
full := fmt.Sprintf("%s/%s", req.RegistryURL, imageName)
|
|
if err := s.dockerClient.PushImage(ctx, imageName, req.RegistryURL); err != nil {
|
|
return nil, fmt.Errorf("failed to push image: %w", err)
|
|
}
|
|
imageName = full
|
|
}
|
|
|
|
imageInfo, err := s.dockerClient.GetImageInfo(ctx, imageName)
|
|
if err != nil {
|
|
imageInfo = &docker.ImageInfo{Size: 0}
|
|
}
|
|
|
|
return &types.BuildResponse{
|
|
ImageName: imageName,
|
|
ImageTag: req.ImageTag,
|
|
Size: imageInfo.Size,
|
|
Digest: imageInfo.Digest,
|
|
}, nil
|
|
}
|