mirror of
https://github.com/ceph/ceph
synced 2025-02-20 01:17:47 +00:00
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:
commit
14a2501f4b
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user