From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 18 Jun 2017 18:00:15 +0000 (+0300)
Subject: fix docker bootstrap
X-Git-Url: https://git.pld-linux.org/?p=projects%2Fcleanbuild.git;a=commitdiff_plain;h=125f8f48ef407b6dc26d4e6f8cd5ae05cd3ba534

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 baba9f0..7a5c41b 100755
--- 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 461d81a..936da2c 100644
--- 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