Skip to content

Commit 05c78a9

Browse files
committed
Nit: readability
1 parent 9fc8b34 commit 05c78a9

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

internal/container/dockerflags.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ func ParseDockerFlags(flags string) (ParsedFlags, error) {
7575
return result, nil
7676
}
7777

78+
// parseBindMount parses a HOST:CONTAINER[:ro] volume spec into a BindMount.
7879
func parseBindMount(spec string) (runtime.BindMount, error) {
7980
parts := strings.SplitN(spec, ":", 3)
8081
if len(parts) < 2 {

internal/container/start.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,14 @@ func Start(ctx context.Context, rt runtime.Runtime, sink output.Sink, opts Start
128128
}
129129
binds = append(binds, runtime.BindMount{HostPath: volumeDir, ContainerPath: "/var/lib/localstack"})
130130

131-
allFlags := strings.TrimSpace(opts.DockerFlags + " " + c.DockerFlags)
131+
var flagParts []string
132+
if opts.DockerFlags != "" {
133+
flagParts = append(flagParts, opts.DockerFlags)
134+
}
135+
if c.DockerFlags != "" {
136+
flagParts = append(flagParts, c.DockerFlags)
137+
}
138+
allFlags := strings.Join(flagParts, " ")
132139
var extra ParsedFlags
133140
if allFlags != "" {
134141
extra, err = ParseDockerFlags(allFlags)

0 commit comments

Comments
 (0)