Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/docker/api_blueprint.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ type ContainerCreateRequestContainer struct {
Tty bool `json:"tty,omitempty"`
StdinOpen bool `json:"stdin_open,omitempty"`

Command string `json:"command,omitempty"`
Entrypoint string `json:"entrypoint,omitempty"`
Command strslice.StrSlice `json:"command,omitempty"`
Entrypoint strslice.StrSlice `json:"entrypoint,omitempty"`
Runtime string `json:"runtime,omitempty"`
WorkingDir string `json:"working_dir,omitempty"`
User string `json:"user,omitempty"`
Expand Down Expand Up @@ -515,12 +515,12 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
}
}

if container.Command != "" {
containerConfig.Cmd = strings.Fields(container.Command)
if container.Command != nil {
containerConfig.Cmd = strslice.StrSlice(container.Command)
}

if container.Entrypoint != "" {
containerConfig.Entrypoint = strslice.StrSlice(strings.Fields(container.Entrypoint))
if container.Entrypoint != nil {
containerConfig.Entrypoint = strslice.StrSlice(container.Entrypoint)
}

// For Expose / Ports
Expand Down
4 changes: 2 additions & 2 deletions src/docker/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ func ExportContainer(containerID string) (ContainerCreateRequestContainer, error
Image: detailedInfo.Config.Image,
Environment: detailedInfo.Config.Env,
Labels: detailedInfo.Config.Labels,
Command: strings.Join(detailedInfo.Config.Cmd, " "),
Entrypoint: strings.Join(detailedInfo.Config.Entrypoint, " "),
Command: detailedInfo.Config.Cmd,
Entrypoint: detailedInfo.Config.Entrypoint,
WorkingDir: detailedInfo.Config.WorkingDir,
User: detailedInfo.Config.User,
Tty: detailedInfo.Config.Tty,
Expand Down
5 changes: 4 additions & 1 deletion src/docker/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ func RunDB(db utils.DatabaseConfig) (DockerServiceCreateRequest, error) {
Name: db.Hostname,
Image: imageName,
RestartPolicy: "always",
Command: "--wiredTigerCacheSizeGB 0.25",
Command: []string{
"mongod",
"--wiredTigerCacheSizeGB=0.25",
},
Environment: []string{
"MONGO_INITDB_ROOT_USERNAME=" + db.Username,
"MONGO_INITDB_ROOT_PASSWORD=" + db.Password,
Expand Down