Skip to content

Commit e46c265

Browse files
SchmaetzSchmaetz
authored
Merge pull request #13 from cybertec-postgresql/remove-walg
updated readme
2 parents 6c88249 + 453c507 commit e46c265

File tree

4 files changed

+39
-40
lines changed

4 files changed

+39
-40
lines changed

‎Makefile‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
# Define Default if Values not exist
3-
BASE_IMAGE ?= rockylinux:9.1-minimal
3+
BASE_IMAGE ?= rockylinux:9.3-minimal
44
BASEOS ?= rocky9
55
IMAGE_REPOSITORY ?= docker.io
66
IMAGE_PATH ?= cybertec-pg-container
77
PGVERSION ?= 16
8-
PGVERSION_FULL ?= 16.1
8+
PGVERSION_FULL ?= 16.2
99
OLD_PG_VERSIONS ?= 13 14 15
10-
PATRONI_VERSION ?= 3.2.1
11-
PGBACKREST_VERSION ?= 2.44
12-
POSTGIS_VERSION ?= 33
10+
PATRONI_VERSION ?= 3.1.2
11+
PGBACKREST_VERSION ?= 2.50
12+
POSTGIS_VERSION ?= 34
1313
PACKAGER ?= dnf
1414
BUILD ?= 1
1515
IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(BUILD)
@@ -32,30 +32,30 @@ postgres-stage: base postgres-stage
3232
postgres-gis: base postgres-gis
3333
postgres-oracle: base postgres-oracle
3434
exporter: exporter
35-
#--no-cache
35+
3636
base-build:
37-
docker build $(ROOTPATH) \
38-
--file $(ROOTPATH)/docker/base/Dockerfile \
39-
--tag cybertec-pg-container/base:$(BASEOS)-$(BUILD) \
40-
--build-arg BASE_IMAGE \
41-
--build-arg IMAGE_REPOSITORY \
42-
--build-arg BASEOS \
43-
--build-arg PACKAGER \
37+
docker build $(ROOTPATH) \
38+
--file $(ROOTPATH)/docker/base/Dockerfile \
39+
--tag cybertec-pg-container/base:$(BASEOS)-$(BUILD) \
40+
--build-arg BASE_IMAGE \
41+
--build-arg IMAGE_REPOSITORY \
42+
--build-arg BASEOS \
43+
--build-arg PACKAGER \
4444
--build-arg CONTAINERSUITE
4545
base: base-build;
4646

4747
pgbackrest-build:
48-
docker build $(ROOTPATH) \
49-
--file $(ROOTPATH)/docker/pgbackrest/Dockerfile \
50-
--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG)-$(BUILD) \
51-
--build-arg BASE_IMAGE \
52-
--build-arg IMAGE_REPOSITORY \
53-
--build-arg BASEOS \
54-
--build-arg PACKAGER \
55-
--build-arg CONTAINERSUITE \
56-
--build-arg BUILD \
57-
--build-arg PGBACKREST_VERSION \
58-
--build-arg OLD_PG_VERSIONS \
48+
docker build $(ROOTPATH) \
49+
--file $(ROOTPATH)/docker/pgbackrest/Dockerfile \
50+
--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG)-$(BUILD) \
51+
--build-arg BASE_IMAGE \
52+
--build-arg IMAGE_REPOSITORY \
53+
--build-arg BASEOS \
54+
--build-arg PACKAGER \
55+
--build-arg CONTAINERSUITE \
56+
--build-arg BUILD \
57+
--build-arg PGBACKREST_VERSION \
58+
--build-arg OLD_PG_VERSIONS \
5959
--build-arg PGVERSION
6060

6161
pgbackrest: pgbackrest-build;
@@ -144,4 +144,4 @@ exporter-build:
144144
--build-arg OLD_PG_VERSION \
145145
--build-arg PGVERSION
146146

147-
exporter: exporter-build
147+
exporter: exporter-build

‎Readme.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ On Kubernetes and Kubernetes-based environments, the image uses the k8-etcd, oth
2323
export BASEOS=rocky9
2424
export PACKAGER=dnf
2525
export CONTAINERSUITE=cybertec-pg-container
26-
export PGBACKREST_VERSION=2.49
27-
export PATRONI_VERSION=3.1.1
26+
export PGBACKREST_VERSION=2.50
27+
export PATRONI_VERSION=3.1.2
2828
export PG_MAJOR=16
29-
export PG_VERSION=16.1
30-
export OLD_PG_VERSIONS="12 13 14 15"
31-
export POSTGIS_VERSION=32
29+
export PG_VERSION=16.2
30+
export OLD_PG_VERSIONS="13 14 15"
31+
export POSTGIS_VERSION=34
3232
export BUILD=1
33+
export ARCH=x86_64
3334

3435
<p>You can build all images with make
3536
- make all

‎motd‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
echo "
2-
______________.___.______________________________________________________________ __________ ________ _________ ________ _______________________ .___ _______ _____________________
3-
\_ ___ \__ | |\______ \_ _____/\______ \__ ___/\_ _____/\_ ___ \ \______ \/ _____/ \_ ___ \ \_____ \ \ \__ ___/ _ \ | |\ \ \_ _____/\______ \
4-
/ \ \// | | | | _/| __)_ | _/ | | | __)_ / \ \/ ______ | ___/ \ ___ ______ / \ \/ / | \ / | \| | / /_\ \| |/ | \ | __)_ | _/
5-
\ \___\____ | | | \| \ | | \ | | | \\ \____ /_____/ | | \ \_\ \ /_____/ \ \____/ | \/ | \ |/ | \ / | \| \ | | \
6-
\______ / ______| |______ /_______ / |____|_ / |____| /_______ / \______ / |____| \______ / \______ /\_______ /\____|__ /____|\____|__ /___\____|__ /_______ / |____|_ /
7-
\/\/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/
8-
2+
______________.___.______________________________________________________________ __________ ________ _________ __ .__
3+
\_ ___ \__ | |\______ \_ _____/\______ \__ ___/\_ _____/\_ ___ \ \______ \/ _____/ \_ ___ \ ____ _____/ |______ |__| ____ ___________
4+
/ \ \// | | | | _/| __)_ | _/ | | | __)_ / \ \/ ______ | ___/ \ ___ ______ / \ \/ / _ \ / \ __\__ \ | |/ \_/ __ \_ __ \
5+
\ \___\____ | | | \| \ | | \ | | | \\ \____ /_____/ | | \ \_\ \ /_____/ \ \___( <_> ) | \ | / __ \| | | \ ___/| | \/
6+
\______ / ______| |______ /_______ / |____|_ / |____| /_______ / \______ / |____| \______ / \______ /\____/|___| /__| (____ /__|___| /\___ >__|
7+
\/\/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/
98

109

1110
This container is managed by runit, when stopping/starting services use sv

‎scripts/spilo_commons.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
# (min_version, max_version, shared_preload_libraries, extwlist.extensions)
1414
extensions = {
1515
'timescaledb': (13, 16, False, True),
16-
'pg_cron': (13, 16, False, True),
17-
'pg_stat_kcache': (13, 16, False, False),
18-
'pg_partman': (13, 16, False, True)
16+
'pg_partman': (13, 16, False, True),
17+
'pg_stat_statements': (14, 16, True, True)
1918
}
2019

2120
def adjust_extensions(old, version, extwlist=False):

0 commit comments

Comments
 (0)