package build: improve speed

Author: vadv

Makefile.pkg

@@ -1,4 +1,4 @@
-PACKAGECLOUD_TOKEN ?= $(PACKAGECLOUD_TOKEN)
+TOKEN ?= $(PACKAGECLOUD_TOKEN)
 
 prepare_builddir: clean
 	mkdir -p build
@@ -19,38 +19,45 @@ rpm: prepare_builddir
 		$(BUILDDIR)/packaging/rpm/SPECS/mamonsu.spec
 	cp -av $(BUILDDIR)/packaging/rpm/RPMS/noarch/mamonsu*.rpm .
 
-pkg: prepare_pkg build/pkg_debian build/pkg_ubuntu build/pkg_centos
-	@echo Cloud done
+pkg: build/prepare build/all
+	docker run -v "$(WORKDIR)":/src --rm debian:wheezy bash -exc " \
+		cp /src/packaging/push.rb /src/build/out && cd /src/build/out && \
+		(apt-get update -m || apt-get update -m || apt-get update -m) && \
+		apt-get install -y ruby-dev && gem install --no-ri --no-rdoc package_cloud -v 0.2.37 && \
+		TOKEN=$(TOKEN) ruby push.rb"
 
-prepare_pkg:
+build/prepare:
 	mkdir -p build
+	touch build/prepare
+
+build/all: build/pkg_debian build/pkg_ubuntu build/pkg_centos
+	@echo Build for all platform: done
+	touch build/all
 
 build/pkg_debian: build/pkg_debian_7 build/pkg_debian_8
-	@echo Debian done
+	@echo Debian: done
 
 build/pkg_ubuntu: build/pkg_ubuntu_14_04 build/pkg_ubuntu_15_10 build/pkg_ubuntu_16_04 build/pkg_ubuntu_16_10
-	@echo Ubuntu done
+	@echo Ubuntu: done
 
 build/pkg_centos: build/pkg_centos_6 build/pkg_centos_7
-	@echo Centos done
+	@echo Centos: done
 
 define build_deb
-	docker run -v "$(WORKDIR)":/var/tmp -e LANG=C.UTF-8 --rm $1:$2 bash -exc " \
-		cp -a /var/tmp /var/build && \
+	docker run -v "$(WORKDIR)":/src --rm $1:$2 bash -exc " \
+		cp -a /src /var/build && \
 		find /var/build -type d -exec chmod 0755 {} \; && find /var/build -type f -exec chmod 0644 {} \; && \
 		cd /var/build && (apt-get update -m || apt-get update -m || apt-get update -m) && \
-		apt-get install -y make dpkg-dev debhelper python-dev python-setuptools ruby-dev && make deb && \
-		(type gem | apt-get install -y rubygems) && gem install package_cloud --no-ri --no-rdoc && \
-		PACKAGECLOUD_TOKEN=$(PACKAGECLOUD_TOKEN) package_cloud push postgrespro/mamonsu/$1/$2 *.deb"
+		apt-get install -y make dpkg-dev debhelper python-dev python-setuptools && make deb && \
+		mkdir -p /src/build/out/$1/$2 && cp *.deb /src/build/out/$1/$2"
 endef
 
 define build_rpm
-	docker run -v "$(WORKDIR)":/var/tmp -e LANG=C.UTF-8 --rm $1:$2 bash -exc " \
-		cp -a /var/tmp /var/build && \
+	docker run -v "$(WORKDIR)":/src --rm $1:$2 bash -exc " \
+		cp -a /src /var/build && \
 		find /var/build -type d -exec chmod 0755 {} \; && find /var/build -type f -exec chmod 0644 {} \; && \
-		cd /var/build && yum install -y tar make rpm-build python2-devel python-setuptools ruby-devel && make rpm && \
-		gem install package_cloud --no-ri --no-rdoc && \
-		PACKAGECLOUD_TOKEN=$(PACKAGECLOUD_TOKEN) package_cloud push postgrespro/mamonsu/el/$2 *.rpm"
+		cd /var/build && yum install -y tar make rpm-build python2-devel python-setuptools && make rpm && \
+		mkdir -p /src/build/out/el/$2 && cp *.rpm /src/build/out/el/$2"
 endef
 
 build/pkg_debian_7:

packaging/push.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+token = ENV["TOKEN"]
+
+# el/6/some.rpm or debian/wheezy/some.deb
+Dir.glob("*/*/*") do |file|
+  distrib, codename, package = file.split("/")
+  puts "Push #{package} for #{distrib}/#{codename}..."
+  cmd = "package_cloud push postgrespro/mamonsu/#{distrib}/#{codename} #{file}"
+  system({'LANG' => 'C.UTF-8', 'PACKAGECLOUD_TOKEN' => token}, cmd)
+  exit $?.exitstatus unless $?.success?
+end