Merge pull request containers#12951 from rhatdan/commit

Fix #2 for compat commit handling of --changes
Luap99 · Jan 21, 2022 · e3ea996 · e3ea996
2 parents 6e17158 + 653da8f
commit e3ea996
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
@@ -97,13 +97,13 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 
 	query := struct {
-		Author    string `schema:"author"`
-		Changes   string `schema:"changes"`
-		Comment   string `schema:"comment"`
-		Container string `schema:"container"`
-		Pause     bool   `schema:"pause"`
-		Repo      string `schema:"repo"`
-		Tag       string `schema:"tag"`
+		Author    string   `schema:"author"`
+		Changes   []string `schema:"changes"`
+		Comment   string   `schema:"comment"`
+		Container string   `schema:"container"`
+		Pause     bool     `schema:"pause"`
+		Repo      string   `schema:"repo"`
+		Tag       string   `schema:"tag"`
 		// fromSrc   string  # fromSrc is currently unused
 	}{
 		Tag: "latest",
@@ -138,8 +138,8 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
 	options.Message = query.Comment
 	options.Author = query.Author
 	options.Pause = query.Pause
-	if query.Changes != "" {
-		options.Changes = strings.Split(query.Changes, ",")
+	for _, change := range query.Changes {
+		options.Changes = append(options.Changes, strings.Split(change, "\n")...)
 	}
 	ctr, err := runtime.LookupContainer(query.Container)
 	if err != nil {

diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
@@ -434,7 +434,7 @@ cid=$(jq -r '.Id' <<<"$output")
 t POST "commit?container=nonesuch" 404
 
 cparam="repo=newrepo&tag=v3&comment=abcd&author=eric"
-cparam="$cparam&format=docker&changes=CMD=/bin/bar,EXPOSE=9090"
+cparam="$cparam&format=docker&changes=CMD%20/bin/bar%0aEXPOSE%209090"
 t POST "commit?container=${cid:0:12}&$cparam" 201 \
   .Id~[0-9a-f]\\{64\\}
 iid=$(jq -r '.Id' <<<"$output")