Merge pull request ceph#59841 from phlogistonjohn/jjm-containerized-build-pyalt

containerized build tools [V2]

Author: zmc

Dockerfile.build

@@ -0,0 +1,32 @@
+ARG DISTRO
+
+FROM scratch as bootstrap
+ARG CEPH_CTR_SRC=/usr/local/src/ceph
+COPY \
+    src/script/lib-build.sh \
+    src/script/run-make.sh \
+    ${CEPH_CTR_SRC}/src/script/
+COPY debian ${CEPH_CTR_SRC}/debian
+COPY \
+    ceph.spec.in \
+    do_cmake.sh \
+    install-deps.sh \
+    run-make-check.sh \
+    src/script/buildcontainer-setup.sh \
+    ${CEPH_CTR_SRC}
+
+
+FROM $DISTRO
+ENV FOR_MAKE_CHECK=1
+ARG DISTRO
+ARG CEPH_CTR_SRC=/usr/local/src/ceph
+ARG CLEAN_DNF=yes
+ARG CEPH_BRANCH=main
+COPY --from=bootstrap ${CEPH_CTR_SRC} ${CEPH_CTR_SRC}
+# Note that we do not use ENV for the following. This is because we do not
+# want them permamently stored in the container's layer.
+RUN DISTRO=$DISTRO \
+    CEPH_BRANCH=$CEPH_BRANCH \
+    CLEAN_DNF=$CLEAN_DNF \
+    CEPH_CTR_SRC=${CEPH_CTR_SRC} \
+    bash -x ${CEPH_CTR_SRC}/buildcontainer-setup.sh

make-debs.sh

@@ -20,7 +20,6 @@ set -xe
 base=${1:-/tmp/release}
 releasedir=$base/$NAME/WORKDIR
 rm -fr $(dirname $releasedir)
-mkdir -p $releasedir
 #
 # remove all files not under git so they are not
 # included in the distribution.
@@ -38,6 +37,7 @@ vers=$(git describe --match "v*" | sed s/^v//)
 #
 # rename the tarbal to match debian conventions and extract it
 #
+mkdir -p $releasedir
 mv ceph-$vers.tar.bz2 $releasedir/ceph_$vers.orig.tar.bz2
 tar -C $releasedir -jxf $releasedir/ceph_$vers.orig.tar.bz2
 #