summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-12-10 15:32:55 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-12-13 09:52:24 +0100
commit81a0a79844f952877f23dca680513dcd54d41c6d (patch)
tree5d3a94d0c3959909d26c17b7b8015577fced24a6
parente993b88c03e1ef822532aacdbc7e6e381143afd3 (diff)
downloadpodman-81a0a79844f952877f23dca680513dcd54d41c6d.tar.gz
podman-81a0a79844f952877f23dca680513dcd54d41c6d.tar.bz2
podman-81a0a79844f952877f23dca680513dcd54d41c6d.zip
compat build: adhere to q/quiet
Fixes: #12566 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
-rw-r--r--pkg/api/handlers/compat/images_build.go2
-rw-r--r--test/apiv2/10-images.at8
2 files changed, 7 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index f85df02e1..a665be4fb 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -655,7 +655,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
return
case <-runCtx.Done():
if success {
- if !utils.IsLibpodRequest(r) {
+ if !utils.IsLibpodRequest(r) && !query.Quiet {
m.Stream = fmt.Sprintf("Successfully built %12.12s\n", imageID)
if err := enc.Encode(m); err != nil {
logrus.Warnf("Failed to json encode error %v", err)
diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at
index e67f559f3..85d4d69ed 100644
--- a/test/apiv2/10-images.at
+++ b/test/apiv2/10-images.at
@@ -196,12 +196,16 @@ fi
curl -XPOST --data-binary @<(cat $CONTAINERFILE_TAR) \
-H "content-type: application/tar" \
--dump-header "${TMPD}/headers.txt" \
- -o /dev/null \
- "http://$HOST:$PORT/v1.40/libpod/build?dockerfile=containerfile" &> /dev/null
+ -o "${TMPD}/response.txt" \
+ "http://$HOST:$PORT/v1.40/build?dockerfile=containerfile&q=true" &> /dev/null
if ! grep -q '200 OK' "${TMPD}/headers.txt"; then
echo -e "${red}NOK: Image build from tar failed response was not 200 OK (application/tar)"
BUILD_TEST_ERROR="1"
fi
+if grep -E "\"[0-9a-f]{64}\\\n\"" $(jq .stream "${TMPD}/response.txt"); then
+ echo -e "${red} quiet-mode should only send image ID"
+ BUILD_TEST_ERROR="1"
+fi
# Yes, this is very un-RESTful re: Content-Type header ignored when compatibility endpoint used
# See https://github.com/containers/podman/issues/11012