Merge pull request #13 from cybertec-postgresql/remove-walg

updated readme
cybertec-postgresql · Feb 21, 2024 · e46c265 · e46c265
2 parents 6c88249 + 453c507
commit e46c265
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 40 deletions.
diff --git a/Makefile b/Makefile
@@ -1,15 +1,15 @@
 
 # Define Default if Values not exist
-BASE_IMAGE ?= rockylinux:9.1-minimal
+BASE_IMAGE ?= rockylinux:9.3-minimal
 BASEOS ?= rocky9
 IMAGE_REPOSITORY ?= docker.io
 IMAGE_PATH ?= cybertec-pg-container
 PGVERSION ?= 16
-PGVERSION_FULL ?= 16.1
+PGVERSION_FULL ?= 16.2
 OLD_PG_VERSIONS ?= 13 14 15
-PATRONI_VERSION ?= 3.2.1
-PGBACKREST_VERSION ?= 2.44
-POSTGIS_VERSION ?= 33
+PATRONI_VERSION ?= 3.1.2
+PGBACKREST_VERSION ?= 2.50
+POSTGIS_VERSION ?= 34
 PACKAGER ?= dnf
 BUILD ?= 1
 IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(BUILD)
@@ -32,30 +32,30 @@ postgres-stage: base postgres-stage
 postgres-gis: base postgres-gis
 postgres-oracle: base postgres-oracle
 exporter: exporter
-#--no-cache
+
 base-build:
-		docker build $(ROOTPATH) 							\
-			--file $(ROOTPATH)/docker/base/Dockerfile 	\
-			--tag cybertec-pg-container/base:$(BASEOS)-$(BUILD) 		\
-			--build-arg BASE_IMAGE							\
-			--build-arg IMAGE_REPOSITORY 					\
-			--build-arg BASEOS 								\
-			--build-arg PACKAGER 							\
+		docker build $(ROOTPATH) 								\
+			--file $(ROOTPATH)/docker/base/Dockerfile 		 	\
+			--tag cybertec-pg-container/base:$(BASEOS)-$(BUILD) \
+			--build-arg BASE_IMAGE								\
+			--build-arg IMAGE_REPOSITORY 						\
+			--build-arg BASEOS 									\
+			--build-arg PACKAGER 								\
 			--build-arg CONTAINERSUITE 						
 base: base-build;		
 
 pgbackrest-build:
-		docker build $(ROOTPATH)							\
-			--file $(ROOTPATH)/docker/pgbackrest/Dockerfile 	\
-			--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG)-$(BUILD) 		\
-			--build-arg BASE_IMAGE							\
-			--build-arg IMAGE_REPOSITORY 					\
-			--build-arg BASEOS 								\
-			--build-arg PACKAGER 							\
-			--build-arg CONTAINERSUITE 						\
-			--build-arg BUILD 								\
-			--build-arg PGBACKREST_VERSION 					\
-			--build-arg OLD_PG_VERSIONS						\
+		docker build $(ROOTPATH)											\
+			--file $(ROOTPATH)/docker/pgbackrest/Dockerfile 				\
+			--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG)-$(BUILD) 	\
+			--build-arg BASE_IMAGE											\
+			--build-arg IMAGE_REPOSITORY 									\
+			--build-arg BASEOS 												\
+			--build-arg PACKAGER 											\
+			--build-arg CONTAINERSUITE 										\
+			--build-arg BUILD 												\
+			--build-arg PGBACKREST_VERSION 									\
+			--build-arg OLD_PG_VERSIONS										\
 			--build-arg PGVERSION 												
 
 pgbackrest: pgbackrest-build;
@@ -144,4 +144,4 @@ exporter-build:
 			--build-arg OLD_PG_VERSION 							\
 			--build-arg PGVERSION 							
 
-exporter: exporter-build
+exporter: exporter-build
diff --git a/Readme.md b/Readme.md
@@ -23,13 +23,14 @@ On Kubernetes and Kubernetes-based environments, the image uses the k8-etcd, oth
     export BASEOS=rocky9
     export PACKAGER=dnf
     export CONTAINERSUITE=cybertec-pg-container
-    export PGBACKREST_VERSION=2.49
-    export PATRONI_VERSION=3.1.1
+    export PGBACKREST_VERSION=2.50
+    export PATRONI_VERSION=3.1.2
     export PG_MAJOR=16
-    export PG_VERSION=16.1
-    export OLD_PG_VERSIONS="12 13 14 15"
-    export POSTGIS_VERSION=32
+    export PG_VERSION=16.2
+    export OLD_PG_VERSIONS="13 14 15"
+    export POSTGIS_VERSION=34
     export BUILD=1
+    export ARCH=x86_64
 
 <p>You can build all images with make
 - make all

diff --git a/motd b/motd
@@ -1,11 +1,10 @@
 echo "
-______________.___.______________________________________________________________          __________  ________          _________  ________    _______________________  .___ _______  _____________________ 
-\_   ___ \__  |   |\______   \_   _____/\______   \__    ___/\_   _____/\_   ___ \         \______   \/  _____/          \_   ___ \ \_____  \   \      \__    ___/  _  \ |   |\      \ \_   _____/\______   \
-/    \  \//   |   | |    |  _/|    __)_  |       _/ |    |    |    __)_ /    \  \/   ______ |     ___/   \  ___   ______ /    \  \/  /   |   \  /   |   \|    | /  /_\  \|   |/   |   \ |    __)_  |       _/
-\     \___\____   | |    |   \|        \ |    |   \ |    |    |        \\     \____ /_____/ |    |   \    \_\  \ /_____/ \     \____/    |    \/    |    \    |/    |    \   /    |    \|        \ |    |   \
- \______  / ______| |______  /_______  / |____|_  / |____|   /_______  / \______  /         |____|    \______  /          \______  /\_______  /\____|__  /____|\____|__  /___\____|__  /_______  / |____|_  /
-        \/\/               \/        \/         \/                   \/         \/                           \/                  \/         \/         \/              \/            \/        \/         \/ 
-
+______________.___.______________________________________________________________          __________  ________          _________                __         .__                     
+\_   ___ \__  |   |\______   \_   _____/\______   \__    ___/\_   _____/\_   ___ \         \______   \/  _____/          \_   ___ \  ____   _____/  |______  |__| ____   ___________ 
+/    \  \//   |   | |    |  _/|    __)_  |       _/ |    |    |    __)_ /    \  \/   ______ |     ___/   \  ___   ______ /    \  \/ /  _ \ /    \   __\__  \ |  |/    \_/ __ \_  __ \
+\     \___\____   | |    |   \|        \ |    |   \ |    |    |        \\     \____ /_____/ |    |   \    \_\  \ /_____/ \     \___(  <_> )   |  \  |  / __ \|  |   |  \  ___/|  | \/
+ \______  / ______| |______  /_______  / |____|_  / |____|   /_______  / \______  /         |____|    \______  /          \______  /\____/|___|  /__| (____  /__|___|  /\___  >__|   
+        \/\/               \/        \/         \/                   \/         \/                           \/                  \/            \/          \/        \/     \/       
 
 
 This container is managed by runit, when stopping/starting services use sv

diff --git a/scripts/spilo_commons.py b/scripts/spilo_commons.py
@@ -13,9 +13,8 @@
 # (min_version, max_version, shared_preload_libraries, extwlist.extensions)
 extensions = {
     'timescaledb':    (13, 16, False,  True),
-    'pg_cron':        (13, 16, False,  True),
-    'pg_stat_kcache': (13, 16, False,  False),
-    'pg_partman':     (13, 16, False, True)
+    'pg_partman':     (13, 16, False, True),
+    'pg_stat_statements':   (14, 16, True, True)
 }
 
 def adjust_extensions(old, version, extwlist=False):