Skip to content

Commit 7eaac77

Browse files
kulaginmkulaginm
committed
Merge remote-tracking branch 'origin/master' into release_2_5
2 parents 49caaa3 + fc752c8 commit 7eaac77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+3946
-36
lines changed

Diff for: ‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@
5454
/make_dockerfile.sh
5555
/backup_restore.sh
5656

57+
# Packaging
58+
/build
59+
/packaging/pkg/tarballs/pgpro.tar.bz2
60+
/packaging/repo/pg_probackup
61+
/packaging/repo/pg_probackup-forks
62+
5763
# Misc
5864
.python-version
5965
.vscode

Diff for: ‎Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
PROGRAM = pg_probackup
2+
WORKDIR ?= $(CURDIR)
3+
BUILDDIR = $(WORKDIR)/build/
4+
PBK_GIT_REPO = https://github.com/postgrespro/pg_probackup
25

36
# utils
47
OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o \
@@ -80,3 +83,7 @@ src/walmethods.h: $(srchome)/src/bin/pg_basebackup/walmethods.h
8083
ifeq ($(PORTNAME), aix)
8184
CC=xlc_r
8285
endif
86+
87+
include packaging/Makefile.pkg
88+
include packaging/Makefile.repo
89+
include packaging/Makefile.test

Diff for: ‎README.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ For detailed release plans check [Milestones](https://github.com/postgrespro/pg_
6666

6767
## Installation and Setup
6868
### Windows Installation
69-
Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/2.4.9).
69+
Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/2.4.15).
7070

7171
### Linux Installation
7272
#### pg_probackup for vanilla PostgreSQL
@@ -82,6 +82,11 @@ sudo sh -c 'echo "deb-src [arch=amd64] https://repo.postgrespro.ru/pg_probackup/
8282
/etc/apt/sources.list.d/pg_probackup.list' && sudo apt-get update
8383
sudo apt-get source pg-probackup-{14,13,12,11,10,9.6}
8484

85+
#DEB Astra Linix Orel
86+
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
87+
sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
88+
sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}{-dbg,}
89+
8590
#RPM Centos Packages
8691
rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
8792
yum install pg_probackup-{14,13,12,11,10,9.6}
@@ -135,6 +140,12 @@ sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PR
135140
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}
136141
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}-dbg
137142

143+
#DEB Astra Linix Orel
144+
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
145+
sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
146+
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}{-dbg,}
147+
148+
138149
#RPM Centos Packages
139150
rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-centos.noarch.rpm
140151
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}

Diff for: ‎doc/pgprobackup.xml

+4
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,7 @@ BEGIN;
619619
CREATE ROLE backup WITH LOGIN;
620620
GRANT USAGE ON SCHEMA pg_catalog TO backup;
621621
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
622+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
622623
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
623624
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean) TO backup;
624625
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup() TO backup;
@@ -637,6 +638,7 @@ BEGIN;
637638
CREATE ROLE backup WITH LOGIN;
638639
GRANT USAGE ON SCHEMA pg_catalog TO backup;
639640
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
641+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
640642
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
641643
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup;
642644
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup(boolean) TO backup;
@@ -657,6 +659,7 @@ BEGIN;
657659
CREATE ROLE backup WITH LOGIN;
658660
GRANT USAGE ON SCHEMA pg_catalog TO backup;
659661
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
662+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
660663
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
661664
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup;
662665
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup(boolean, boolean) TO backup;
@@ -5900,6 +5903,7 @@ BEGIN;
59005903
CREATE ROLE backup WITH LOGIN REPLICATION;
59015904
GRANT USAGE ON SCHEMA pg_catalog TO backup;
59025905
GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
5906+
GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
59035907
GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
59045908
GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup;
59055909
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup(boolean, boolean) TO backup;

Diff for: ‎packaging/Dockerfiles/Dockerfile-altlinux_8

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM alt:p8
2+
RUN ulimit -n 1024 && apt-get update -y && apt-get install -y tar wget rpm-build
3+
RUN ulimit -n 1024 && apt-get install -y make perl libicu-devel glibc-devel bison flex
4+
RUN ulimit -n 1024 && apt-get install -y git perl-devel readline-devel libxml2-devel libxslt-devel python-devel zlib-devel openssl-devel libkrb5 libkrb5-devel
5+
RUN ulimit -n 1024 && apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-altlinux_9

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM alt:p9
2+
RUN ulimit -n 1024 && apt-get update -y && apt-get install -y tar wget rpm-build
3+
RUN ulimit -n 1024 && apt-get install -y make perl libicu-devel glibc-devel bison flex
4+
RUN ulimit -n 1024 && apt-get install -y git perl-devel readline-devel libxml2-devel libxslt-devel python-devel zlib-devel openssl-devel libkrb5 libkrb5-devel
5+
RUN ulimit -n 1024 && apt-get dist-upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-astra_1.11

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM pgpro/astra:1.11
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install reprepro -y
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-centos_7

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM centos:7
2+
RUN yum install -y tar wget rpm-build yum-utils
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN yum install -y git
5+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-centos_8

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM centos:8
2+
RUN yum install -y tar wget rpm-build yum-utils
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN yum install -y git
5+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-createrepo1C

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM ubuntu:17.10
2+
RUN apt-get -qq update -y
3+
RUN apt-get -qq install -y reprepro rpm createrepo gnupg rsync perl less wget expect rsync dpkg-dev
4+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-debian_10

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM debian:10
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-debian_11

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM debian:11
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-debian_8

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM debian:8
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-debian_9

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM debian:9
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-oraclelinux_6

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM oraclelinux:6
2+
RUN yum install -y tar wget rpm-build yum-utils
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN yum install -y git openssl
5+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-oraclelinux_7

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM oraclelinux:7
2+
RUN yum install -y tar wget rpm-build yum-utils
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN yum install -y git openssl
5+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-oraclelinux_8

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM oraclelinux:8
2+
RUN yum install -y tar wget rpm-build yum-utils
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN yum install -y git openssl
5+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-rhel_7

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM registry.access.redhat.com/ubi7
2+
RUN yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/elfutils-0.176-5.el7.x86_64.rpm
3+
RUN yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/rpm-build-4.11.3-45.el7.x86_64.rpm
4+
RUN yum install -y tar wget yum-utils
5+
RUN yum install -y gcc make perl libicu-devel glibc-devel
6+
RUN yum install -y git
7+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-rhel_8

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM registry.access.redhat.com/ubi8
2+
RUN yum install -y tar wget rpm-build yum-utils
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel
4+
RUN yum install -y git
5+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-rosa_6

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM pgpro/rosa-6
2+
RUN yum install -y tar wget rpm-build yum-utils
3+
RUN yum install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN yum install -y git
5+
RUN yum upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-suse_15.1

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM opensuse/leap:15.1
2+
RUN ulimit -n 1024 && zypper install -y tar wget rpm-build
3+
RUN ulimit -n 1024 && zypper install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN ulimit -n 1024 && zypper install -y git rsync

Diff for: ‎packaging/Dockerfiles/Dockerfile-suse_15.2

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM opensuse/leap:15.2
2+
RUN ulimit -n 1024 && zypper install -y tar wget rpm-build
3+
RUN ulimit -n 1024 && zypper install -y gcc make perl libicu-devel glibc-devel bison flex
4+
RUN ulimit -n 1024 && zypper install -y git rsync

Diff for: ‎packaging/Dockerfiles/Dockerfile-ubuntu_14.04

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM ubuntu:14.04
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-ubuntu_16.04

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM ubuntu:16.04
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-ubuntu_18.04

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM ubuntu:18.04
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-ubuntu_18.10

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM ubuntu:18.10
2+
RUN apt-get update -y
3+
RUN apt-get install -y devscripts
4+
RUN apt-get install -y dpkg-dev lsb-release git equivs wget vim
5+
RUN apt-get install -y cmake bison flex libboost-all-dev
6+
RUN apt-get install -y reprepro
7+
RUN apt-get upgrade -y

Diff for: ‎packaging/Dockerfiles/Dockerfile-ubuntu_20.04

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM ubuntu:20.04
2+
ENV DEBIAN_FRONTEND noninteractive
3+
RUN ulimit -n 1024 && apt-get update -y
4+
RUN ulimit -n 1024 && apt-get install -y devscripts
5+
RUN ulimit -n 1024 && apt-get install -y dpkg-dev lsb-release git equivs wget vim
6+
RUN ulimit -n 1024 && apt-get install -y cmake bison flex libboost-all-dev
7+
RUN ulimit -n 1024 && apt-get install -y reprepro
8+
RUN ulimit -n 1024 && apt-get upgrade -y

0 commit comments

Comments
 (0)