rpm dir is volume, so can't init it's contents in image
$image
# these paths need to be accessible for builder
-docker exec --user=root $name chown builder:builder rpm/logs rpm/BUILD .ccache
+docker exec --user=root $name chown builder:builder rpm rpm/logs rpm/BUILD .ccache
+
+if [ ! -d $topdir/rpm-build-tools ]; then
+ docker exec $name builder --init-rpm-dir
+fi
# fetch sources and install deps
docker exec $name builder -g -R $package
if [ $rc -eq 0 ]; then
# finished ok, cleanup
- docker kill $name && docker rm $name || :
+ docker kill $name >/dev/null && docker rm $name >/dev/null || :
fi
# propagate error
# for builder -R
&& echo 'builder ALL = NOPASSWD:/usr/bin/poldek -q --update --upa' > /etc/sudoers.d/builder \
&& echo 'builder ALL = NOPASSWD:/usr/bin/poldek --noask --caplookup --uniq -uG *' >> /etc/sudoers.d/builder \
- # init rpm dir and replace system package
- && sudo -H -u builder builder --init-rpm-dir \
- && ln -snf ~builder/rpm/rpm-build-tools/builder.sh /usr/bin/builder \
# configures empty dir
&& rm /etc/poldek/repos.d/pld-builder.conf \
# preserve downloaded packages