done

Author: Schmaetz

Makefile

@@ -13,6 +13,7 @@ PGBACKREST_VERSION ?= 2.50
 POSTGIS_VERSION ?= 34
 PACKAGER ?= dnf
 BUILD ?= 1
+ARCH ?= amd64
 IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(BUILD)
 POSTGIS_IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(POSTGIS_VERSION)-$(BUILD)
 
@@ -72,10 +73,11 @@ postgres-build:
 			--build-arg PACKAGER=$(PACKAGER) 									\
 			--build-arg CONTAINERSUITE=$(CONTAINERSUITE) 						\
 			--build-arg BUILD=$(BUILD) 											\
+			--build-arg ARCH=$(ARCH) 											\
 			--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) 				\
 			--build-arg PATRONI_VERSION=$(PATRONI_VERSION) 						\
 			--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)"					\
-			--build-arg PGVERSION=$(PGVERSION)							
+			--build-arg PGVERSION=$(PGVERSION)
 
 postgres: postgres-build
 
@@ -92,7 +94,7 @@ postgres-stage-build:
 			--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) 							\
 			--build-arg PATRONI_VERSION=$(PATRONI_VERSION) 									\
 			--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)"								\
-			--build-arg PGVERSION=$(PGVERSION)							
+			--build-arg PGVERSION=$(PGVERSION)
 
 postgres-stage: postgres-stage-build
 
@@ -110,7 +112,7 @@ postgres-gis-build:
 			--build-arg PATRONI_VERSION=$(PATRONI_VERSION) 							\
 			--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)"						\
 			--build-arg PGVERSION=$(PGVERSION)										\
-			--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION)							
+			--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION)
 
 postgres-gis: postgres-gis-build
 

docker/pgbackrest/Dockerfile

@@ -20,7 +20,8 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
 		tar \
 		bzip2 \
 		lz4 \
-		#crunchy-backrest-${BACKREST_VER} \
+		dumb-init \
+		pgbackrest-${PGBACKREST_VERSION} \
 		&& ${PACKAGER} -y clean all ; \
 else \
 	${PACKAGER} -y install --nodocs  \
@@ -30,8 +31,8 @@ else \
 		bzip2 \
 		lz4 \
 		#postgresql${PGVERSION}-server \
+		dumb-init \
 		pgbackrest-${PGBACKREST_VERSION} \
-		nano \
 		&& ${PACKAGER} -y clean all ; \
 fi
 
@@ -86,4 +87,4 @@ ENTRYPOINT ["/scripts/nss_wrapper/nss_wrapper.sh"]
 
 USER 26
 
-CMD ["/bin/sh", "/launch.sh", "init"]
+CMD ["dumb-init", "/launch.sh", "init"]

docker/postgres/Dockerfile

@@ -13,11 +13,9 @@ ARG OLD_PG_VERSIONS
 ARG PG_SUPPORTED_VERSIONS="$PGVERSION"
 ARG PG_SUPPORTED_VERSIONS="$OLD_PG_VERSIONS $PGVERSION"
 ARG TIMESCALEDB="1.7.5 2.3.1 2.13.0"
+ARG ARCH
 # Spilo-specific
 ENV SET_USER=REL3_0_0 \
-    #BG_MON_COMMIT=e22182e129ce357b5aa80090fba2aacfc42b1996 \
-    #PG_AUTH_MON_COMMIT=52d90bbaa6d3c61195cd9532ebe036b1183808c5 \
-    #PG_MON_COMMIT=54fbdcc3cfe7e2a626bd96dda644d9a0c6866b58 \
     PLPROFILER=REL4_1 \
     PG_PROFILE=0.3.6 \
     PAM_OAUTH2=v1.0.1 \
@@ -28,6 +26,7 @@ ENV SET_USER=REL3_0_0 \
 # Get some Standard-Stuff
 RUN if [ "$BASEOS" = "ubi8" ] ; then \
 	${PACKAGER} -y update && ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 \
+		--setopt=skip_missing_names_on_install=False \
         openssh-clients \
         openssh-server \
         shadow-utils \
@@ -40,15 +39,14 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
         python3-psutil \
         python3-requests \
         python3-etcd \
-        #python3-pyyaml \
+        python3-pyyaml \
+        python3-setuptools \
         git \
         patchutils \
         binutils \
         make \
         cmake \
         gcc \
-        #curl \
-        libcurl-devel \
         pam-devel \
         wget \
         mlocate \
@@ -58,11 +56,11 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
         redhat-rpm-config \
         krb5-devel \
         busybox \
-        dpkg \
         jq \
         rsync \
+        dumb-init \ 
         libicu \
-		pgbackrest-${PGBACKREST_VERSION} \
+        pgbackrest-${PGBACKREST_VERSION} \
 		&& ${PACKAGER} -y clean all ; \
 else \
 	${PACKAGER} -y update && ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 \
@@ -78,17 +76,15 @@ else \
         python3-psycopg2 \
         python3-psutil \
         python3-requests \
-        python3-etcd \
+        #python3-etcd \
         python3-pyyaml \
-        python3-etcd \
+        python3-setuptools \
         git \
         patchutils \
         binutils \
         make \
         cmake \
         gcc \
-        #curl \
-        libcurl-devel \
         pam-devel \
         wget \
         mlocate \
@@ -98,7 +94,6 @@ else \
         redhat-rpm-config \
         krb5-devel \
         busybox \
-        dpkg \
         jq \
         rsync \
         dumb-init \ 
@@ -107,71 +102,22 @@ else \
 		&& ${PACKAGER} -y clean all ; \
 fi
 
-# RUN ${PACKAGER} -y update && ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 \
-#         openssh-clients \
-#         openssh-server \
-#         shadow-utils \
-#         tar \
-#         bzip2 \
-#         lz4 \
-#         python3 \
-#         python3-pip \
-#         python3-psycopg2 \
-#         python3-psutil \
-#         python3-requests \
-#         python3-etcd \
-#         #python3-pyyaml \
-#         git \
-#         patchutils \
-#         binutils \
-#         make \
-#         cmake \
-#         gcc \
-#         #curl \
-#         libcurl-devel \
-#         pam-devel \
-#         wget \
-#         mlocate \
-#         git-clang-format \
-#         openssl-devel \
-#         ccache \
-#         redhat-rpm-config \
-#         krb5-devel \
-#         busybox \
-#         dpkg \
-#         jq \
-#         rsync \
-#     && ${PACKAGER} -y clean all;
-
 # install etcdctl
-RUN ETCDVERSION=3.3.27 \
-    && curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-$(dpkg --print-architecture).tar.gz \
+RUN ETCDVERSION=3.5.13 \
+    && curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etcd-v${ETCDVERSION}-linux-${ARCH}.tar.gz \
     | tar xz -C /bin --strip=1 --wildcards --no-anchored --no-same-owner etcdctl etcd;
 
-# Install Patroni
-# RUN pip3 install 'PyYAML<6.0' setuptools pystache loader dumb-init kazoo meld3 boto 
-# #swiftclient
-# RUN ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 \
-#                     python3-etcd python3-consul  \
-#                     python3-gevent python3-greenlet python3-cachetools \
-#                     python3-rsa python3-pyasn1-modules  python3-cffi \
-#     && ${PACKAGER} -y clean all;
-
-    # python3-kazoo python3-meld3 python3-boto python3-swiftclient
-
-#RUN pip3 install patroni[kubernetes$EXTRAS]==$PATRONI_VERSION
-
-#RUN  mkdir /usr/lib/postgresql
 ENV PATHBACKUP = $PATH
-#ENV PATH=$PATH:/usr/pgsql-$PGVERSION/bin
-#RUN echo $PATH
+
 # Install pam_oauth2.so
 #RUN #git clone -b $PAM_OAUTH2 --recurse-submodules https://github.com/zalando-pg/pam-oauth2.git \
     #&& make -C pam-oauth2 install \
     #&& curl -sL https://github.com/zalando-pg/bg_mon/archive/$BG_MON_COMMIT.tar.gz | tar xz \
     #&& curl -sL https://github.com/zalando-pg/pg_auth_mon/archive/$PG_AUTH_MON_COMMIT.tar.gz | tar xz \
-RUN pip3 install 'PyYAML<6.0' setuptools pystache loader dumb-init kazoo meld3 boto \ 
-    && pip3 install patroni[kubernetes$EXTRAS]==$PATRONI_VERSION \
+
+    #pip3.11 install 'PyYAML<6.0' setuptools pystache loader dumb-init kazoo meld3 boto \ 
+RUN pip3 install 'PyYAML<6.0' setuptools pystache loader dumb-init kazoo meld3 boto python-etcd --upgrade \ 
+    && pip3 install patroni[kubernetes$EXTRAS]==$PATRONI_VERSION --upgrade \
     && mkdir /usr/lib/postgresql \
     && curl -sL https://github.com/cybertec-postgresql/pg_permissions/archive/$PG_PERMISSIONS_COMMIT.tar.gz | tar xz \
     #&& curl -sL https://github.com/x4m/pg_tm_aux/archive/$PG_TM_AUX_COMMIT.tar.gz | tar xz \
@@ -349,7 +295,7 @@ RUN for version in $PG_SUPPORTED_VERSIONS; do \
 done
 
 # Clean Up Packages binutils glibc-devel glibc-static
-RUN ${PACKAGER} -y remove python3-pip python3-wheel python3-dev git patchutils flatpak glibc-static gcc glibc-devel \
+RUN ${PACKAGER} -y remove python3.11-pip python3.11-wheel python3.11-dev git patchutils flatpak glibc-static gcc glibc-devel \
     #&& ${PACKAGER} -y autoremove \
     && ${PACKAGER} -y clean dbcache \
     && ${PACKAGER} -y clean all; 

launcher/pgbackrest/launch.sh

@@ -6,7 +6,11 @@ PGBACKREST_PATH=${PGBACKREST_PATH:-'/opt/pgbackrest'}
 source "${PGBACKREST_PATH}/bin/shell_lib.sh"
 output_info "Start pgBackRest-PreCondition-Check"
 
-if [ "$MODE" == "pgbackrest" ] && [ "$COMMAND" == "backup" ]; then
+if [ "$MODE" == "pgbackrest" ] && [ "$COMMAND" == "repo-host" ]; then
+    output_info "pgBackRest: Start Repo-Host"
+    pgbackrest server
+
+elif [ "$MODE" == "pgbackrest" ] && [ "$COMMAND" == "backup" ]; then
     output_info "pgBackRest: Backup-Job found"
     source "${PGBACKREST_PATH}/bin/backup/start.sh"
     output_success "pgBackRest: Backup-Job completed"

scripts/configure_spilo.py

@@ -32,7 +32,7 @@
 PROVIDER_LOCAL = "local"
 PROVIDER_UNSUPPORTED = "unsupported"
 USE_KUBERNETES = os.environ.get('KUBERNETES_SERVICE_HOST') is not None
-KUBERNETES_DEFAULT_LABELS = '{"application": "cpo"}'
+KUBERNETES_DEFAULT_LABELS = '{"application": "cpo", "member.cpo.opensource.cybertec.at/type": "postgres"}'
 PATRONI_DCS = ('kubernetes', 'zookeeper', 'exhibitor', 'consul', 'etcd3', 'etcd')
 AUTO_ENABLE_WALG_RESTORE = ('WAL_S3_BUCKET', 'WALE_S3_PREFIX', 'WALG_S3_PREFIX', 'WALG_AZ_PREFIX', 'WALG_SSH_PREFIX')
 WALG_SSH_NAMES = ['WALG_SSH_PREFIX', 'SSH_PRIVATE_KEY_PATH', 'SSH_USERNAME', 'SSH_PORT']
@@ -1082,7 +1082,7 @@ def main():
 
     if provider == PROVIDER_LOCAL and not any(1 for key in config.keys() if key in PATRONI_DCS):
         link_runit_service(placeholders, 'etcd')
-        config['etcd'] = {'host': '127.0.0.1:2379'}
+        config['etcd3'] = {'host': '127.0.0.1:2379'}
 
     pgdata = config['postgresql']['data_dir']
     version_file = os.path.join(pgdata, 'PG_VERSION')

scripts/pgbackrest/repo-host/start.sh

@@ -6,27 +6,25 @@ PGVER=$(psql -d "$2" -XtAc "SELECT pg_catalog.current_setting('server_version_nu
 if [ "$PGVER" -ge 12 ]; then RESET_ARGS="oid, oid, bigint"; fi
 
 (
-# echo "DO \$\$
-# BEGIN
-#     PERFORM * FROM pg_catalog.pg_authid WHERE rolname = 'admin';
-#     IF FOUND THEN
-#         ALTER ROLE admin WITH CREATEDB NOLOGIN NOCREATEROLE NOSUPERUSER NOREPLICATION INHERIT;
-#     ELSE
-#         CREATE ROLE admin CREATEDB;
-#     END IF;
-# END;\$\$;
-
-# GRANT cron_admin TO admin;
-
-# DO \$\$
-# BEGIN
-#     PERFORM * FROM pg_catalog.pg_authid WHERE rolname = '$1';
-#     IF FOUND THEN
-#         ALTER ROLE $1 WITH NOCREATEDB NOLOGIN NOCREATEROLE NOSUPERUSER NOREPLICATION INHERIT;
-#     ELSE
-#         CREATE ROLE $1;
-#     END IF;
-# END;\$\$;"
+echo "DO \$\$
+BEGIN
+    PERFORM * FROM pg_catalog.pg_authid WHERE rolname = 'admin';
+    IF FOUND THEN
+        ALTER ROLE admin WITH CREATEDB NOLOGIN NOCREATEROLE NOSUPERUSER NOREPLICATION INHERIT;
+    ELSE
+        CREATE ROLE admin CREATEDB;
+    END IF;
+END;\$\$;
+
+DO \$\$
+BEGIN
+    PERFORM * FROM pg_catalog.pg_authid WHERE rolname = '$1';
+    IF FOUND THEN
+        ALTER ROLE $1 WITH NOCREATEDB NOLOGIN NOCREATEROLE NOSUPERUSER NOREPLICATION INHERIT;
+    ELSE
+        CREATE ROLE $1;
+    END IF;
+END;\$\$;"
 
 while IFS= read -r db_name; do
     echo "\c ${db_name}"
@@ -50,8 +48,8 @@ while IFS= read -r db_name; do
         fi
     fi
     sed "s/:HUMAN_ROLE/$1/" create_user_functions.sql
-    echo "CREATE EXTENSION IF NOT EXISTS pg_stat_statements SCHEMA public;
-ALTER EXTENSION set_user UPDATE;
+    echo "CREATE EXTENSION IF NOT EXISTS pg_stat_statements SCHEMA public;"
+# ALTER EXTENSION set_user UPDATE;
 # GRANT EXECUTE ON FUNCTION public.set_user(text) TO admin;
 # GRANT EXECUTE ON FUNCTION public.pg_stat_statements_reset($RESET_ARGS) TO admin;"
 

scripts/post_init.sh

@@ -14,7 +14,8 @@
 extensions = {
     'timescaledb':    (13, 16, False,  True),
     'pg_partman':     (13, 16, False, True),
-    'pg_stat_statements':   (14, 16, True, True)
+    'pg_stat_statements':  (34, 16, True, True),
+    'pgaudit'           :  (13, 16, True, True)
 }
 
 def adjust_extensions(old, version, extwlist=False):