X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2Ff_isoroot%2Ff_repobuild%2FMakefile;fp=fuel%2Fbuild%2Ff_isoroot%2Ff_repobuild%2FMakefile;h=b8f0aa2a688d4e0867f3e7c03911d8750c413f27;hb=d8d4303b2cea8dca0ce67407b6a60145dbfe111c;hp=ee0e81974bf6d68626b479cc65f37c98afa211f5;hpb=ddfecd370517e4593ced3809ab6a67fb8188366e;p=genesis.git

diff --git a/fuel/build/f_isoroot/f_repobuild/Makefile b/fuel/build/f_isoroot/f_repobuild/Makefile
index ee0e819..b8f0aa2 100644
--- a/fuel/build/f_isoroot/f_repobuild/Makefile
+++ b/fuel/build/f_isoroot/f_repobuild/Makefile
@@ -15,11 +15,10 @@ DOCKVERSION = 1.0
 .PHONY: all
 all: .nailgun
 
-.fuel-createmirror:
-	sudo apt-get install -y rsync python dpkg-dev fakeroot openssl
-	sudo ln -s `pwd` /var/www
-	sudo mkdir /var/log/mirror-sync
-	sudo chmod 777 /var/log/mirror-sync
+.nailgun:
+	sudo apt-get update
+	sudo apt-get upgrade -y
+	sudo apt-get install -y rsync python python-yaml dpkg-dev openssl
 	rm -rf tmpiso tmpdir
 	mkdir tmpiso
 	fuseiso ${ISOCACHE} tmpiso
@@ -27,9 +26,12 @@ all: .nailgun
 	fusermount -u tmpiso
 	rm -rf tmpiso
 	sudo dpkg -i fuel-createmirror_6.1*.deb
-	sudo sed -i 's/DOCKER_MODE=true/DOCKER_MODE=false/' /etc/fuel-createmirror/common.cfg
-	touch .fuel-createmirror
-
+	rm -Rf nailgun
+	sudo mkdir -p /var/www
+	sudo su - -c /opt/fuel-createmirror-6.1/fuel-createmirror
+	sudo chmod -R 755 /var/www/nailgun
+	cp -Rp /var/www/nailgun .
+	touch .nailgun
 
 .PHONY: clean
 clean:
@@ -42,9 +44,3 @@ release:.nailgun
 	@mkdir -p ../release/opnfv
 	@cp -Rp nailgun ../release/opnfv/nailgun
 
-.nailgun: .fuel-createmirror
-	rm -Rf nailgun
-	fakeroot /opt/fuel-createmirror-6.1/fuel-createmirror
-	# Bug fix for https://bugs.launchpad.net/fuel/+bug/1476593
-	find nailgun/mos-ubuntu -type d -exec chmod 755 {} \;
-	touch .nailgun