9 files changed, 5 insertions, 26 deletions

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 41a555f6c..0d2bfd708 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -19,7 +19,11 @@ RUN apt-get update
 RUN apt-get install -y software-properties-common python-software-properties \
     make python-setuptools python-all dpkg-dev debhelper \
     fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
-    ca-certificates sudo apt-utils lsb-release dosfstools debmirror p7zip-full
+    ca-certificates sudo apt-utils lsb-release dosfstools debmirror p7zip-full \
+    build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
+
+RUN gem install fpm
+RUN pip install fuel-plugin-builder
 
 RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
 RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
index 24fa1785d..ed3be2971 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -35,9 +35,6 @@ release:.bgpvpnbuild
 
 .bgpvpnbuild:
 	rm -rf fuel-plugin-bgpvpn
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo gem install fpm
-	sudo pip install fuel-plugin-builder
 	git clone $(BGPVPN_REPO)
 	cd fuel-plugin-bgpvpn; \
 	git checkout $(BGPVPN_BRANCH); \
diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
index 4b68475f2..ba2fd0be0 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
+++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile
@@ -35,8 +35,6 @@ release:.kvmbuild
 .kvmbuild:
 	# fix me
 	@sudo rm -rf kvmfornfv
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo pip install fuel-plugin-builder
 	../../docker/ubuntu-builder/install_docker.sh
 	git clone $(KVMFORNFV_REPO)
 	cd kvmfornfv; \
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index c5978ded0..e2cbf7d46 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -28,16 +28,6 @@ release:.odlbuild
 	cp gitinfo_odlplugin.txt $(BUILD_BASE)
 .odlbuild:
 	rm -rf fuel-plugin-opendaylight
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo gem install fpm
-	#Temporary fpb needs to be build from sources
-	git clone -b $(FPB_BRANCH) $(FPB_REPO)
-	cd fuel-plugins; \
-	if [ -n $(FPB_CHANGE) ]; then \
-	   git checkout $(FPB_CHANGE); \
-		 python setup.py sdist; \
-		 sudo pip install ./dist/fuel-plugin-builder-*.tar.gz; \
-	fi
 	git clone -b $(ODL_BRANCH) $(ODL_REPO)
 	cd fuel-plugin-opendaylight; \
 	if [ -n $(ODL_CHANGE) ]; then \
diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
index 355292d6d..a9dcb2200 100644
--- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
+++ b/build/f_isoroot/f_onosfwpluginbuild/Makefile
@@ -34,8 +34,6 @@ release:.onosbuild
 
 .onosbuild:
 	@rm -rf fuel-plugin-onos
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo pip install fuel-plugin-builder
 	git clone $(ONOS_REPO)
 	cd fuel-plugin-onos; \
 	git checkout $(ONOS_BRANCH); \
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index 5e38b4c53..ecf586a76 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@ -34,8 +34,6 @@ release:.ovsbuild
 
 .ovsbuild:
 	@rm -rf fuel-plugin-ovs
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo pip install fuel-plugin-builder
 	../../docker/ubuntu-builder/install_docker.sh
 	git clone $(OVS_NSH_DPDK_REPO)
 	cd fuel-plugin-ovs; \
diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
index 4ca5236a0..9e432d146 100644
--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
@@ -34,8 +34,6 @@ release:.ovsnfvbuild
 
 .ovsnfvbuild:
 	@rm -rf ovsnfv
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo pip install fuel-plugin-builder
 	git clone $(OVSNFV_DPDK_REPO) ovsnfv
 	cd ovsnfv; \
 	git checkout $(OVSNFV_DPDK_BRANCH); \
diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
index d713882fe..9bd236a8d 100644
--- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
+++ b/build/f_isoroot/f_vsperfpluginbuild/Makefile
@@ -34,8 +34,6 @@ release:.vsperfbuild
 
 .vsperfbuild:
 	@rm -rf vswitchperf
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo pip install fuel-plugin-builder
 	../../docker/ubuntu-builder/install_docker.sh
 	git clone $(VSPERF_REPO) vswitchperf
 	cd vswitchperf; \
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/Makefile b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
index 79b8fbd16..47723d53e 100644
--- a/build/f_isoroot/f_yardstick-pluginbuild/Makefile
+++ b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
@@ -35,8 +35,6 @@ release:.yardstickbuild
 
 .yardstickbuild:
 	@rm -rf yardstick
-	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
-	sudo pip install fuel-plugin-builder
 	git clone $(YARDSTICK_REPO) yardstick
 	cd yardstick; \
 	git checkout $(YARDSTICK_BRANCH); \