Merge PR #40193 into master

* refs/pull/40193/head:
	ceph-debug-docker: podman build doesn't accept input via stdin

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2021-03-17 19:31:43 -07:00
commit 14a2501f4b
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -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"