[projects/cleanbuild] run builder --init-rpm-dir before replacing symlink

glen glen at pld-linux.org
Wed Jun 14 22:50:26 CEST 2017


commit 51983ecefcfc8ba8705cc184aa264fb529b66416
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Jun 14 22:51:03 2017 +0300

    run builder --init-rpm-dir before replacing symlink

 docker/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/docker/Dockerfile b/docker/Dockerfile
index be259c7..d5894f3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,9 +12,10 @@ 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 \
-	# replace system builder script with local checkout
-	&& ln -snf ~builder/rpm/rpm-build-tools/builder.sh /usr/bin/builder \
 	# preserve downloaded packages
+	# 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 \
 	&& poldek-config keep_downloads yes \
 	&& poldek --clean-whole
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/4f6e2b515b98ba137dfcde393db3db0658b4bfb8



More information about the pld-cvs-commit mailing list