[Issue #135] deb/rpm repository infrastructure

Author: gsmolk

.gitignore

@@ -8,6 +8,8 @@ __pycache__
 tags
 dist
 build
+packaging/repo/gnupg/*
+packaging/repo/rpmmacros
 
 *.deb
 *.rpm

Makefile.pkg

@@ -1,4 +1,4 @@
-TOKEN ?= $(PACKAGECLOUD_TOKEN)
+# TOKEN ?= $(PACKAGECLOUD_TOKEN)
 # Check for SUSE and alt linux which need specific spec file
 ifeq "$(wildcard /etc/SuSE-rel*)" ""
 ifeq "$(wildcard /etc/altlinux-rel*)" ""
@@ -30,12 +30,12 @@ rpm: prepare_builddir $(BUILDDIR)/packaging/rpm/SPECS/$(SPEC)
 		$(BUILDDIR)/packaging/rpm/SPECS/$(SPEC)
 	cp -av $(BUILDDIR)/packaging/rpm/RPMS/noarch/mamonsu*.rpm .
 
-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"
+#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"
 
 build/prepare:
 	mkdir -p build
@@ -45,64 +45,153 @@ 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 build/pkg_debian_9
+build/pkg_debian: build/pkg_debian_8 build/pkg_debian_9 build/pkg_debian_10
 	@echo Debian: done
 
-build/pkg_ubuntu: build/pkg_ubuntu_14_04 build/pkg_ubuntu_16_04 build/pkg_ubuntu_17_10 build/pkg_ubuntu_18_04
+build/pkg_ubuntu: build/pkg_ubuntu_16_04 build/pkg_ubuntu_18_04 build/pkg_ubuntu_18_10
 	@echo Ubuntu: done
 
-build/pkg_centos: build/pkg_centos_6 build/pkg_centos_7
+build/pkg_centos: build/pkg_centos_6 build/pkg_centos_7 build/rpm_repo_package_centos
 	@echo Centos: done
 
 define build_deb
-	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 && make deb && \
-		mkdir -p /src/build/out/$1/$2 && cp *.deb /src/build/out/$1/$2"
+	docker run -v "$(WORKDIR)":/app/in \
+		-v "$(WORKDIR)/build/pkg/$1/$2/mamonsu/$(VERSION)":/app/out \
+		-e "DISTRIB=$1" -e "DISTRIB_VERSION=$2" \
+		--rm $1:$2 /app/in/packaging/scripts/deb.sh
 endef
 
 define build_rpm
-	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 && make rpm && \
-		mkdir -p /src/build/out/el/$2 && cp *.rpm /src/build/out/el/$2"
+	docker run -v "$(WORKDIR)":/app/in \
+		-v "$(WORKDIR)/build/pkg/$1/$2/mamonsu/$(VERSION)":/app/out \
+		-e "VERSION=$(VERSION)" -e "DISTRIB=$1" -e "DISTRIB_VERSION=$2" \
+		--rm $1:$2 /app/in/packaging/scripts/rpm.sh
 endef
 
-build/pkg_debian_7:
-	$(call build_deb,debian,wheezy)
-	touch build/pkg_debian_7
+define build_rpm_repo_pkg
+	docker run -v "$(WORKDIR)":/app/in \
+		-v "$(WORKDIR)/build/pkg/keys":/app/out \
+		-e "VERSION=$(VERSION)" -e "DISTRIB=$1" -e "DISTRIB_VERSION=$2" \
+		--rm $1:$2 /app/in/packaging/scripts/repo_rpm.sh
+endef
+
+build/rpm_repo_package_centos:
+	$(call build_rpm_repo_pkg,centos,7)
+	touch build/rpm_repo_package_centos
 
 build/pkg_debian_8:
-	$(call build_deb,debian,jessie)
+	$(call build_deb,debian,8,jessie)
 	touch build/pkg_debian_8
 
 build/pkg_debian_9:
-	$(call build_deb,debian,stretch)
+	$(call build_deb,debian,9,stretch)
 	touch build/pkg_debian_9
 
+build/pkg_debian_10:
+	$(call build_deb,debian,10,buster)
+	touch build/pkg_debian_10
+
 build/pkg_ubuntu_14_04:
-	$(call build_deb,ubuntu,trusty)
+	$(call build_deb,ubuntu,14.04,trusty)
 	touch build/pkg_ubuntu_14_04
 
 build/pkg_ubuntu_16_04:
-	$(call build_deb,ubuntu,xenial)
+	$(call build_deb,ubuntu,16.04,xenial)
 	touch build/pkg_ubuntu_16_04
 
-build/pkg_ubuntu_17_10:
-	$(call build_deb,ubuntu,artful)
-	touch build/pkg_ubuntu_17_10
-
 build/pkg_ubuntu_18_04:
-	$(call build_deb,ubuntu,bionic)
+	$(call build_deb,ubuntu,18.04,bionic)
 	touch build/pkg_ubuntu_18_04
 
+build/pkg_ubuntu_18_10:
+	$(call build_deb,ubuntu,18.10,cosmic)
+	touch build/pkg_ubuntu_18_10
+
 build/pkg_centos_6:
 	$(call build_rpm,centos,6)
 	touch build/pkg_centos_6
 
 build/pkg_centos_7:
 	$(call build_rpm,centos,7)
 	touch build/pkg_centos_7
+
+#build/pkg_centos_8:
+#	$(call build_rpm,centos,8)
+#	touch build/pkg_centos_8
+
+repo/all: repo/debian repo/ubuntu repo/centos repo/finish
+	@echo Build repo for all platform: done
+	touch build/repo_all
+
+repo/debian: repo/debian_8 repo/debian_9 repo/debian_10
+	@echo Build repo for debian platforms: done
+	touch build/repo_debian
+
+repo/ubuntu: repo/ubuntu_16_04 repo/ubuntu_18_04 repo/ubuntu_18_10
+	@echo Build repo for ubuntu platforms: done
+	touch build/repo_ubuntu
+
+repo/centos: repo/centos_6 repo/centos_7
+	@echo Build repo for centos platforms: done
+	touch build/repo_centos
+
+repo/centos_6:
+	$(call build_repo_rpm,centos,6,6)
+	touch build/repo_centos_6
+
+repo/centos_7:
+	$(call build_repo_rpm,centos,7,7)
+	touch build/repo_centos_7
+
+repo/debian_8:
+	$(call build_repo_deb,debian,8,jessie)
+	touch build/repo_debian_8
+
+repo/debian_9:
+	$(call build_repo_deb,debian,9,stretch)
+	touch build/repo_debian_9
+
+repo/debian_10:
+	$(call build_repo_deb,debian,10,buster)
+	touch build/repo_debian_10
+
+repo/ubuntu_14_04:
+	$(call build_repo_deb,ubuntu,14.04,trusty)
+	touch build/repo_ubuntu_14_04
+
+repo/ubuntu_16_04:
+	$(call build_repo_deb,ubuntu,16.04,xenial)
+	touch build/repo_ubuntu_16_04
+
+repo/ubuntu_18_04:
+	$(call build_repo_deb,ubuntu,18.04,bionic)
+	touch build/repo_ubuntu_18_04
+
+repo/ubuntu_18_10:
+	$(call build_repo_deb,ubuntu,18.10,cosmic)
+	touch build/repo_ubuntu_18_10
+
+repo/finish:
+	$(call repo_finish,centos,7)
+	touch build/repo_finish
+
+define build_repo_deb
+	docker run -v $(WORKDIR)/build/pkg/$1/$2:/app/in -v $(WORKDIR)/packaging/repo:/app/repo \
+	-v $(WORKDIR)/packaging/repo:/app/repo -v $(WORKDIR)/build/www:/app/www \
+	-e "DISTRIB=$1" -e "DISTRIB_VERSION=$2" -e "CODENAME=$3" \
+	--rm $1:$2 /app/repo/scripts/deb.sh
+endef
+
+define build_repo_rpm
+	docker run -v $(WORKDIR)/build/pkg/$1/$2:/app/in -v $(WORKDIR)/packaging/repo:/app/repo \
+	-v $(WORKDIR)/packaging/repo:/app/repo -v $(WORKDIR)/build/www:/app/www \
+	-e "DISTRIB=$1" -e "DISTRIB_VERSION=$2" -e "CODENAME=$3" \
+	--rm $1:$2 /app/repo/scripts/rpm.sh
+endef
+
+define repo_finish
+	docker run -v $(WORKDIR)/build/pkg/keys:/app/in -v $(WORKDIR)/build/www:/app/www \
+	-e "DISTRIB=$1" -e "DISTRIB_VERSION=$2" -e "CODENAME=$3" \
+	--rm $1:$2 bash -exc "cp -av /app/in/*rpm /app/www/mamonsu/keys && cd /app/www/mamonsu/ && \
+	ln -s $(VERSION) latest"
+endef

README.rst

@@ -18,13 +18,20 @@ Development version, available on github, released under BSD 3-clause.
 Installation
 ============
 
-Pre-Build packages for:
+DEB packages for Debian|Ubuntu:
+.. code-block:: bash
+
+    echo "deb [arch=amd64] http://repo.postgrespro.ru/mamonsu/latest/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/mamonsu.list
+    wget -O - http://repo.postgrespro.ru/mamonsu/keys/GPG-KEY-MAMONSU | sudo apt-key add - && sudo apt-get update
+    sudo apt-get install mamonsu
 
-    Linux distros: https://packagecloud.io/postgrespro/mamonsu
+RPM packages for Centos:
+.. code-block:: bash
 
-    `Windows installers <https://oc.postgrespro.ru/index.php/s/qu7YsFvOE55LdXo>`_
+    rpm -ivh https://repo.postgrespro.ru/mamonsu/keys/mamonsu-repo-centos.noarch.rpm
+    yum install mamonsu
 
-NOTE: pre-build packages on packagecloud only for mamonsu 2.3.4
+Pre-Build packages for Windows: `Windows installers <https://oc.postgrespro.ru/index.php/s/qu7YsFvOE55LdXo>`_
 
 Install via pip:
 
@@ -52,6 +59,12 @@ Build rpm:
     $ yum install make rpm-build python2-devel python-setuptools
     $ git clone ... && cd mamonsu && make rpm && rpm -i mamonsu*.rpm
 
+Build repository, `./packaging/repo/gnupg` and `./packaging/repo/rpmmacros` must be provided by caller:
+
+.. code-block:: bash
+
+    $ make -j2 build/all && make -j1 repo/all
+
 Build win32 exe: (worked with python v3.{4,5}: py2exe v0.9.2.2 and pywin32 v220 or python v2.7: py2exe v0.6.9 and pywin32 v220):
 
 .. code-block:: bash

packaging/repo/autosign.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/expect -f
+
+# Copyright Notice:
+# © (C) Postgres Professional 2015-2016 http://www.postgrespro.ru/
+# Distributed under Apache License 2.0
+# Распространяется по лицензии Apache 2.0
+
+set rpmfile [lindex $argv 0]
+spawn rpm --addsign $rpmfile
+expect "Enter pass phrase:"
+send -- "\r"
+expect eof