Skip to content

Modern Docker Management, Designed for Everyone

fix: invalid api input for container creation (#1483)

Kyle Mendell8b2ce8b0f07f
diff --git a/backend/internal/huma/handlers/containers.go b/backend/internal/huma/handlers/containers.go
index 73a59e8b5..b932080fa 100644
--- a/backend/internal/huma/handlers/containers.go
+++ b/backend/internal/huma/handlers/containers.go
@@ -3,6 +3,7 @@ package handlers
import (
"context"
"net/http"
+ "strings"
"github.com/danielgtaylor/huma/v2"
dockercontainer "github.com/docker/docker/api/types/container"
@@ -253,65 +254,237 @@ func (h *ContainerHandler) GetContainerStatusCounts(ctx context.Context, input *
}, nil
}
-func (h *ContainerHandler) CreateContainer(ctx context.Context, input *CreateContainerInput) (*CreateContainerOutput, error) {
- if h.containerService == nil {
- return nil, huma.Error500InternalServerError("service not available")
+func parsePortSpec(spec string) (nat.Port, error) {
+ proto := "tcp"
+ port := spec
+ if strings.Contains(spec, "/") {
+ parts := strings.SplitN(spec, "/", 2)
+ port = parts[0]
+ if parts[1] != "" {
+ proto = parts[1]
+ }
}
- user, exists := humamw.GetCurrentUserFromContext(ctx)
- if !exists {
- return nil, huma.Error401Unauthorized("not authenticated")
+ return nat.NewPort(proto, port)
+}
+
+func resolveCreateCommand(body containertypes.Create) []string {
+ if len(body.Command) > 0 {
+ return body.Command
}
- // Build Docker config from input
- config := &dockercontainer.Config{
- Image: input.Body.Image,
- Cmd: input.Body.Command,
- Entrypoint: input.Body.Entrypoint,
- WorkingDir: input.Body.WorkingDir,
- User: input.Body.User,
- Env: input.Body.Environment,
- ExposedPorts: nat.PortSet{},
- Labels: map[string]string{
- "com.arcane.created": "true",
- },
+ return body.Cmd
+}
+
+func resolveCreateEnv(body containertypes.Create) []string {
+ if len(body.Environment) > 0 {
+ return body.Environment
}
- portBindings := nat.PortMap{}
- for containerPort, hostPort := range input.Body.Ports {
+ return body.Env
+}
+
+func buildCreateLabels(body containertypes.Create) map[string]string {
+ labels := map[string]string{
+ "com.arcane.created": "true",
+ }
+ for key, value := range body.Labels {
+ labels[key] = value
+ }
+
+ return labels
+}
+
+func buildContainerConfig(body containertypes.Create) *dockercontainer.Config {
+ return &dockercontainer.Config{
+ Image: body.Image,
+ Cmd: resolveCreateCommand(body),
+ Entrypoint: body.Entrypoint,
+ WorkingDir: body.WorkingDir,
+ User: body.User,
+ Env: resolveCreateEnv(body),
+ ExposedPorts: nat.PortSet{},
+ Labels: buildCreateLabels(body),
+ Hostname: body.Hostname,
+ Domainname: body.Domainname,
+ AttachStdout: body.AttachStdout,
+ AttachStderr: body.AttachStderr,
+ AttachStdin: body.AttachStdin,
+ Tty: body.Tty,
+ OpenStdin: body.OpenStdin,
+ StdinOnce: body.StdinOnce,
+ NetworkDisabled: body.NetworkDisabled,
+ }
+}
+
+func applyLegacyPortBindings(body containertypes.Create, config *dockercontainer.Config, portBindings nat.PortMap) error {
+ for containerPort, hostPort := range body.Ports {
port, err := nat.NewPort("tcp", containerPort)
if err != nil {
- return nil, huma.Error400BadRequest((&common.InvalidPortFormatError{Err: err}).Error())
+ return err
}
config.ExposedPorts[port] = struct{}{}
portBindings[port] = []nat.PortBinding{{HostPort: hostPort}}
}
- hostConfig := &dockercontainer.HostConfig{
- Binds: input.Body.Volumes,
+ return nil
+}
+
+func applyExposedPorts(exposedPorts map[string]struct{}, config *dockercontainer.Config) error {
+ for portSpec := range exposedPorts {
+ port, err := parsePortSpec(portSpec)
+ if err != nil {
+ return err
+ }
+ config.ExposedPorts[port] = struct{}{}
+ }
+
+ return nil
+}
+
+func buildHostConfigBase(body containertypes.Create, portBindings nat.PortMap) *dockercontainer.HostConfig {
+ return &dockercontainer.HostConfig{
+ Binds: body.Volumes,
PortBindings: portBindings,
- Privileged: input.Body.Privileged,
- AutoRemove: input.Body.AutoRemove,
- RestartPolicy: dockercontainer.RestartPolicy{Name: dockercontainer.RestartPolicyMode(input.Body.RestartPolicy)},
+ Privileged: body.Privileged,
+ AutoRemove: body.AutoRemove,
+ RestartPolicy: dockercontainer.RestartPolicy{Name: dockercontainer.RestartPolicyMode(body.RestartPolicy)},
}
+}
- if input.Body.Memory > 0 {
- hostConfig.Memory = input.Body.Memory
+func applyHostConfigPortBindings(config *dockercontainer.Config, portBindings nat.PortMap, bindings map[string][]containertypes.PortBindingCreate) error {
+ for portSpec, bindingList := range bindings {
+ port, err := parsePortSpec(portSpec)
+ if err != nil {
+ return err
+ }
+ config.ExposedPorts[port] = struct{}{}
+ for _, binding := range bindingList {
+ portBindings[port] = append(portBindings[port], nat.PortBinding{
+ HostPort: binding.HostPort,
+ HostIP: binding.HostIP,
+ })
+ }
}
- if input.Body.CPUs > 0 {
- hostConfig.NanoCPUs = int64(input.Body.CPUs * 1e9)
+
+ return nil
+}
+
+func applyHostConfigSettings(hostConfig *dockercontainer.HostConfig, input *containertypes.HostConfigCreate) {
+ if input == nil {
+ return
}
- var networkingConfig *network.NetworkingConfig
- if len(input.Body.Networks) > 0 {
- networkingConfig = &network.NetworkingConfig{
- EndpointsConfig: make(map[string]*network.EndpointSettings),
+ if input.NetworkMode != "" {
+ hostConfig.NetworkMode = dockercontainer.NetworkMode(input.NetworkMode)
+ }
+ if input.Privileged != nil {
+ hostConfig.Privileged = *input.Privileged
+ }
+ if input.AutoRemove != nil {
+ hostConfig.AutoRemove = *input.AutoRemove
+ }
+ if input.ReadonlyRootfs != nil {
+ hostConfig.ReadonlyRootfs = *input.ReadonlyRootfs
+ }
+ if input.PublishAllPorts != nil {
+ hostConfig.PublishAllPorts = *input.PublishAllPorts
+ }
+ if input.RestartPolicy != nil {
+ hostConfig.RestartPolicy = dockercontainer.RestartPolicy{
+ Name: dockercontainer.RestartPolicyMode(input.RestartPolicy.Name),
+ MaximumRetryCount: input.RestartPolicy.MaximumRetryCount,
+ }
+ }
+ if input.Memory > 0 {
+ hostConfig.Memory = input.Memory
+ }
+ if input.MemorySwap > 0 {
+ hostConfig.MemorySwap = input.MemorySwap
+ }
+ if input.NanoCPUs > 0 {
+ hostConfig.NanoCPUs = input.NanoCPUs
+ }
+ if input.CPUShares > 0 {
+ hostConfig.CPUShares = input.CPUShares
+ }
+}
+
+func applyHostConfigOverrides(body containertypes.Create, config *dockercontainer.Config, hostConfig *dockercontainer.HostConfig, portBindings nat.PortMap) error {
+ if body.HostConfig == nil {
+ return nil
+ }
+
+ if len(body.HostConfig.Binds) > 0 {
+ hostConfig.Binds = body.HostConfig.Binds
+ }
+
+ if len(body.HostConfig.PortBindings) > 0 {
+ if err := applyHostConfigPortBindings(config, portBindings, body.HostConfig.PortBindings); err != nil {
+ return err
+ }
+ }
+
+ applyHostConfigSettings(hostConfig, body.HostConfig)
+ return nil
+}
+
+func applyLegacyResourceLimits(body containertypes.Create, hostConfig *dockercontainer.HostConfig) {
+ if body.Memory > 0 {
+ hostConfig.Memory = body.Memory
+ }
+ if body.CPUs > 0 {
+ hostConfig.NanoCPUs = int64(body.CPUs * 1e9)
+ }
+}
+
+func buildNetworkingConfig(body containertypes.Create) *network.NetworkingConfig {
+ if body.NetworkingConfig != nil && len(body.NetworkingConfig.EndpointsConfig) > 0 {
+ networkingConfig := &network.NetworkingConfig{EndpointsConfig: make(map[string]*network.EndpointSettings)}
+ for name, endpoint := range body.NetworkingConfig.EndpointsConfig {
+ networkingConfig.EndpointsConfig[name] = &network.EndpointSettings{Aliases: endpoint.Aliases}
}
- for _, net := range input.Body.Networks {
+ return networkingConfig
+ }
+
+ if len(body.Networks) > 0 {
+ networkingConfig := &network.NetworkingConfig{EndpointsConfig: make(map[string]*network.EndpointSettings)}
+ for _, net := range body.Networks {
networkingConfig.EndpointsConfig[net] = &network.EndpointSettings{}
}
+ return networkingConfig
}
+ return nil
+}
+
+func (h *ContainerHandler) CreateContainer(ctx context.Context, input *CreateContainerInput) (*CreateContainerOutput, error) {
+ if h.containerService == nil {
+ return nil, huma.Error500InternalServerError("service not available")
+ }
+
+ user, exists := humamw.GetCurrentUserFromContext(ctx)
+ if !exists {
+ return nil, huma.Error401Unauthorized("not authenticated")
+ }
+
+ config := buildContainerConfig(input.Body)
+ portBindings := nat.PortMap{}
+ if err := applyLegacyPortBindings(input.Body, config, portBindings); err != nil {
+ return nil, huma.Error400BadRequest((&common.InvalidPortFormatError{Err: err}).Error())
+ }
+ if err := applyExposedPorts(input.Body.ExposedPorts, config); err != nil {
+ return nil, huma.Error400BadRequest((&common.InvalidPortFormatError{Err: err}).Error())
+ }
+
+ hostConfig := buildHostConfigBase(input.Body, portBindings)
+ if err := applyHostConfigOverrides(input.Body, config, hostConfig, portBindings); err != nil {
+ return nil, huma.Error400BadRequest((&common.InvalidPortFormatError{Err: err}).Error())
+ }
+ applyLegacyResourceLimits(input.Body, hostConfig)
+
+ networkingConfig := buildNetworkingConfig(input.Body)
+
containerJSON, err := h.containerService.CreateContainer(ctx, config, hostConfig, networkingConfig, input.Body.Name, *user, input.Body.Credentials)
if err != nil {
return nil, huma.Error500InternalServerError((&common.ContainerCreationError{Err: err}).Error())
diff --git a/frontend/project.inlang/.gitignore b/frontend/project.inlang/.gitignore
deleted file mode 100644
index 5e4659675..000000000
--- a/frontend/project.inlang/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cache
\ No newline at end of file
diff --git a/frontend/src/lib/components/dialogs/create-container-dialog.svelte b/frontend/src/lib/components/dialogs/create-container-dialog.svelte
index 2e0aa86b6..fcd0d8051 100644
--- a/frontend/src/lib/components/dialogs/create-container-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/create-container-dialog.svelte
@@ -238,6 +238,12 @@
cmd: data.command.trim() ? data.command.trim().split(' ') : undefined,
workingDir: data.workingDir.trim() || undefined,
user: data.user.trim() || undefined,
+ hostname: data.hostname.trim() || undefined,
+ domainname: data.domainname.trim() || undefined,
+ attachStdout: data.attachStdout,
+ attachStderr: data.attachStderr,
+ attachStdin: data.attachStdin,
+ networkDisabled: data.networkDisabled,
...(data.tty && { tty: true }),
...(data.openStdin && { openStdin: true }),
...(data.stdinOnce && { stdinOnce: true }),
@@ -249,6 +255,8 @@
portBindings: Object.keys(dynamicPortBindings).length > 0 ? dynamicPortBindings : undefined,
networkMode: data.networkDisabled ? 'none' : undefined,
...(data.privileged && { privileged: true }),
+ ...(data.readonlyRootfs && { readonlyRootfs: true }),
+ ...(data.publishAllPorts && { publishAllPorts: true }),
...(data.autoRemove && { autoRemove: true }),
...(data.restartPolicy !== 'no' && {
restartPolicy: {
@@ -301,7 +309,9 @@
<Tabs.Content value="basic" class="mt-0 space-y-6">
<div class="grid grid-cols-1 gap-6 lg:grid-cols-2">
<div class="space-y-3">
- <Label for="container-name" class="text-sm font-medium">{m.container_name_label()}</Label>
+ <Label for="container-name" class="text-sm font-medium">
+ {m.container_name_label()} <span class="text-destructive">*</span>
+ </Label>
<Input
id="container-name"
type="text"
@@ -317,7 +327,9 @@
</div>
<div class="space-y-3">
- <Label for="image" class="text-sm font-medium">{m.container_image_label()}</Label>
+ <Label for="image" class="text-sm font-medium">
+ {m.container_image_label()} <span class="text-destructive">*</span>
+ </Label>
<Input
id="image"
type="text"
diff --git a/frontend/src/lib/types/container.type.ts b/frontend/src/lib/types/container.type.ts
index 1fceb94b4..598f81720 100644
--- a/frontend/src/lib/types/container.type.ts
+++ b/frontend/src/lib/types/container.type.ts
@@ -32,6 +32,8 @@ export interface HostConfigCreate {
networkMode?: string;
privileged?: boolean;
autoRemove?: boolean;
+ readonlyRootfs?: boolean;
+ publishAllPorts?: boolean;
memory?: number;
memorySwap?: number;
nanoCpus?: number;
@@ -43,7 +45,7 @@ export interface NetworkingConfig {
}
export interface ContainerCreateRequest {
- name?: string;
+ name: string;
image: string;
cmd?: string[];
entrypoint?: string[];
@@ -54,6 +56,12 @@ export interface ContainerCreateRequest {
labels?: Record<string, string>;
workingDir?: string;
user?: string;
+ hostname?: string;
+ domainname?: string;
+ attachStdout?: boolean;
+ attachStderr?: boolean;
+ attachStdin?: boolean;
+ networkDisabled?: boolean;
tty?: boolean;
openStdin?: boolean;
stdinOnce?: boolean;
diff --git a/types/container/container.go b/types/container/container.go
index 78d4f2fff..8cd521bc6 100644
--- a/types/container/container.go
+++ b/types/container/container.go
@@ -10,6 +10,111 @@ import (
imagetypes "github.com/getarcaneapp/arcane/types/image"
)
+// RestartPolicyCreate represents restart policy options for container creation.
+type RestartPolicyCreate struct {
+ // Name of the restart policy.
+ //
+ // Required: false
+ Name string `json:"name,omitempty"`
+
+ // MaximumRetryCount is only used when name is on-failure.
+ //
+ // Required: false
+ MaximumRetryCount int `json:"maximumRetryCount,omitempty"`
+}
+
+// PortBindingCreate represents host port bindings for container creation.
+type PortBindingCreate struct {
+ // HostIP is the IP address to bind to on the host.
+ //
+ // Required: false
+ HostIP string `json:"hostIp,omitempty"`
+
+ // HostPort is the port on the host.
+ //
+ // Required: false
+ HostPort string `json:"hostPort,omitempty"`
+}
+
+// HostConfigCreate represents host configuration for container creation.
+type HostConfigCreate struct {
+ // Binds is a list of volume bindings.
+ //
+ // Required: false
+ Binds []string `json:"binds,omitempty"`
+
+ // PortBindings maps container ports to host bindings.
+ //
+ // Required: false
+ PortBindings map[string][]PortBindingCreate `json:"portBindings,omitempty"`
+
+ // RestartPolicy for the container.
+ //
+ // Required: false
+ RestartPolicy *RestartPolicyCreate `json:"restartPolicy,omitempty"`
+
+ // NetworkMode for the container.
+ //
+ // Required: false
+ NetworkMode string `json:"networkMode,omitempty"`
+
+ // Privileged indicates if the container runs in privileged mode.
+ //
+ // Required: false
+ Privileged *bool `json:"privileged,omitempty"`
+
+ // AutoRemove indicates if the container is removed when stopped.
+ //
+ // Required: false
+ AutoRemove *bool `json:"autoRemove,omitempty"`
+
+ // Memory limit in bytes.
+ //
+ // Required: false
+ Memory int64 `json:"memory,omitempty"`
+
+ // MemorySwap limits total memory usage (memory + swap) in bytes.
+ //
+ // Required: false
+ MemorySwap int64 `json:"memorySwap,omitempty"`
+
+ // NanoCPUs is CPU allocation in nano CPUs.
+ //
+ // Required: false
+ NanoCPUs int64 `json:"nanoCpus,omitempty"`
+
+ // CPUShares is the relative CPU share weight.
+ //
+ // Required: false
+ CPUShares int64 `json:"cpuShares,omitempty"`
+
+ // ReadonlyRootfs makes the root filesystem read-only.
+ //
+ // Required: false
+ ReadonlyRootfs *bool `json:"readonlyRootfs,omitempty"`
+
+ // PublishAllPorts publishes all exposed ports to random host ports.
+ //
+ // Required: false
+ PublishAllPorts *bool `json:"publishAllPorts,omitempty"`
+}
+
+// EndpointSettingsCreate represents network endpoint settings for container creation.
+type EndpointSettingsCreate struct {
+ // Aliases for the container on this network.
+ //
+ // Required: false
+ Aliases []string `json:"aliases,omitempty"`
+}
+
+// NetworkingConfigCreate represents network configuration for container creation.
+type NetworkingConfigCreate struct {
+ // EndpointsConfig maps network names to endpoint settings.
+ //
+ // Required: false
+ EndpointsConfig map[string]EndpointSettingsCreate `json:"endpointsConfig,omitempty"`
+}
+
// Create is used to create a new container.
type Create struct {
// Name of the container.
@@ -27,6 +132,11 @@ type Create struct {
// Required: false
Command []string `json:"command,omitempty"`
+ // Cmd is an alias for Command.
+ //
+ // Required: false
+ Cmd []string `json:"cmd,omitempty"`
+
// Entrypoint for the container.
//
// Required: false
@@ -47,6 +157,76 @@ type Create struct {
// Required: false
Environment []string `json:"environment,omitempty"`
+ // Env is an alias for Environment.
+ //
+ // Required: false
+ Env []string `json:"env,omitempty"`
+
+ // Labels to set on the container.
+ //
+ // Required: false
+ Labels map[string]string `json:"labels,omitempty"`
+
+ // ExposedPorts are ports exposed by the container.
+ //
+ // Required: false
+ ExposedPorts map[string]struct{} `json:"exposedPorts,omitempty"`
+
+ // HostConfig holds advanced host-level settings.
+ //
+ // Required: false
+ HostConfig *HostConfigCreate `json:"hostConfig,omitempty"`
+
+ // NetworkingConfig defines network endpoints.
+ //
+ // Required: false
+ NetworkingConfig *NetworkingConfigCreate `json:"networkingConfig,omitempty"`
+
+ // Hostname for the container.
+ //
+ // Required: false
+ Hostname string `json:"hostname,omitempty"`
+
+ // Domainname for the container.
+ //
+ // Required: false
+ Domainname string `json:"domainname,omitempty"`
+
+ // AttachStdout attaches stdout.
+ //
+ // Required: false
+ AttachStdout bool `json:"attachStdout,omitempty"`
+
+ // AttachStderr attaches stderr.
+ //
+ // Required: false
+ AttachStderr bool `json:"attachStderr,omitempty"`
+
+ // AttachStdin attaches stdin.
+ //
+ // Required: false
+ AttachStdin bool `json:"attachStdin,omitempty"`
+
+ // Tty allocates a pseudo-TTY.
+ //
+ // Required: false
+ Tty bool `json:"tty,omitempty"`
+
+ // OpenStdin keeps stdin open.
+ //
+ // Required: false
+ OpenStdin bool `json:"openStdin,omitempty"`
+
+ // StdinOnce closes stdin after first attach.
+ //
+ // Required: false
+ StdinOnce bool `json:"stdinOnce,omitempty"`
+
+ // NetworkDisabled disables networking.
+ //
+ // Required: false
+ NetworkDisabled bool `json:"networkDisabled,omitempty"`
+
// Ports is a map of port bindings.
//
// Required: false