From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 17 Mar 2021 17:12:09 +0000 (-0400)
Subject: ceph-debug-docker: podman build doesn't accept input via stdin
X-Git-Tag: v17.1.0~2571^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84ae9432a1391bd11e081548754d732f98bc2957;p=ceph.git

ceph-debug-docker: podman build doesn't accept input via stdin

podman on centos 8 at least doesn't accept the Dockerfile being fed to
it via stdin. Change that branch of the script to use the same method
that the ubuntu side does.

This gets the script working on senta03 for me.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/script/ceph-debug-docker.sh b/src/script/ceph-debug-docker.sh
index 42eaf535b9c..bac583b22c8 100755
--- a/src/script/ceph-debug-docker.sh
+++ b/src/script/ceph-debug-docker.sh
@@ -115,7 +115,7 @@ EOF
         if [ "${FLAVOR}" = "crimson" ]; then
             ceph_debuginfo+=" ceph-crimson-osd-debuginfo ceph-crimson-osd"
         fi
-        time run docker build $CACHE --tag "$tag" - <<EOF
+        cat > Dockerfile <<EOF
 FROM ${env}
 
 WORKDIR /root
@@ -126,6 +126,7 @@ RUN wget -O /etc/yum.repos.d/ceph-dev.repo $repo_url && \
     yum upgrade -y && \
     yum install -y ceph ${ceph_debuginfo} ceph-fuse ${python_bindings}
 EOF
+        time run docker build $CACHE --tag "$tag" .
     fi
     popd
     rm -rf -- "$T"