Merge pull request #600 from kinvolk/alban/cli-order

validation: run CLI with correct argument order
opencontainers · Mar 12, 2018 · cb96426 · cb96426
2 parents 3a83c2c + 79ae4aa
commit cb96426
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/validation/util/container.go b/validation/util/container.go
@@ -69,15 +69,15 @@ func (r *Runtime) SetID(id string) {
 func (r *Runtime) Create() (err error) {
 	var args []string
 	args = append(args, "create")
-	if r.ID != "" {
-		args = append(args, r.ID)
-	}
 	if r.PidFile != "" {
 		args = append(args, "--pid-file", r.PidFile)
 	}
 	if r.BundleDir != "" {
 		args = append(args, "--bundle", r.BundleDir)
 	}
+	if r.ID != "" {
+		args = append(args, r.ID)
+	}
 	cmd := exec.Command(r.RuntimeCommand, args...)
 	id := uuid.NewV4().String()
 	r.stdout, err = os.OpenFile(filepath.Join(r.bundleDir(), fmt.Sprintf("stdout-%s", id)), os.O_CREATE|os.O_EXCL|os.O_RDWR, 0600)