fix docker bootstrap

rpm dir is volume, so can't init it's contents in image

diff --git a/cleanbuild-docker.sh b/cleanbuild-docker.sh
index baba9f0ae9d5502de2212a36a81841d3ed6399e0..7a5c41b78b368fad8901494dbc9da7ad74a4dd79 100755 (executable)
--- a/cleanbuild-docker.sh
+++ b/cleanbuild-docker.sh
@@ -28,7 +28,11 @@ docker run --name=$name -d \
        $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
@@ -66,7 +70,7 @@ while true; do
 
        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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 461d81a253ab7f1833997d02b6bb0fe20d032007..936da2cbcaf5346bff975e18071583669ef027b8 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,9 +12,6 @@ RUN set -x \
        # 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