Dockerfiles updated + Makefile

Author: Schmaetz

Makefile

@@ -7,14 +7,15 @@ IMAGE_REPOSITORY ?= docker.io
 IMAGE_PATH ?= cybertec-pg-container
 CONTAINERSUITE ?= cybertec-pg-container
 PGVERSION ?= 17
-PGVERSION_FULL ?= 17.0
+PGVERSION_FULL ?= 17.4
 OLD_PG_VERSIONS ?= 13 14 15 16
 PATRONI_VERSION ?= multisite-4.0.2.1
-PGBACKREST_VERSION ?= 2.53
+PGBACKREST_VERSION ?= 2.54.2
 POSTGIS_VERSION ?= 34
-ETCD_VERSION ?= 3.5.15
+ETCD_VERSION ?= 3.5.18
+PGBOUNCER_VERSION ?= 1.24
 PACKAGER ?= dnf
-BUILD ?= 2
+BUILD ?= 1
 ARCH ?= amd64
 IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(BUILD)
 POSTGIS_IMAGE_TAG ?= $(BASEOS)-$(PGVERSION_FULL)-$(POSTGIS_VERSION)-$(BUILD)
@@ -143,12 +144,13 @@ pgbouncer-build:
 			--build-arg PACKAGER=$(PACKAGER) 											\
 			--build-arg CONTAINERSUITE=$(CONTAINERSUITE) 								\
 			--build-arg BUILD=$(BUILD) 													\
+			--build-arg PGBOUNCER_VERSION=${PGBOUNCER_VERSION}							\
 			--build-arg PGVERSION=$(PGVERSION)
 
 pgbouncer: pgbouncer-build
 
 exporter-build:
-		docker build $(ROOTPATH)														\
+		docker build $(ROOTPATH)	 --no-cache											\
 			--file $(ROOTPATH)/docker/exporter/Dockerfile 								\
 			--tag cybertec-pg-container/exporter:$(IMAGE_TAG)							\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)										\

docker/exporter/Dockerfile

@@ -15,13 +15,10 @@ RUN ${PACKAGER} -y install --nodocs  \
 		make \
 		&& ${PACKAGER} -y clean all ;
 
-RUN wget https://go.dev/dl/go1.23.0.linux-amd64.tar.gz  && tar -xzf go1.23.0.linux-amd64.tar.gz && mv go /usr/local 
+RUN wget https://go.dev/dl/go1.23.6.linux-amd64.tar.gz  && tar -xzf go1.23.6.linux-amd64.tar.gz && mv go /usr/local 
 ENV PATH=$PATH:/usr/local/go/bin
 
-RUN git clone https://github.com/prometheus-community/postgres_exporter.git && cd postgres_exporter \
-# fix for pg17 
-	&& git fetch origin pull/1072/head:pr-pg17 && git fetch origin pull/1072/head:pr-pg17 && git merge pr-pg17 \
-	&& make build;
+RUN git clone https://github.com/cybertec-postgresql/postgres_exporter.git && cd postgres_exporter && make build;
 
 FROM ${CONTAINERIMAGE}
 COPY --from=builder /usr/bin/dumb-init /usr/bin/dumb-init

docker/pgbackrest/Dockerfile

@@ -154,6 +154,6 @@ VOLUME ["sshd", "/home/postgres/pgdata", "/backrestrepo"]
 
 ENTRYPOINT ["/scripts/nss_wrapper/nss_wrapper.sh"]
 
-USER 26
+USER postgres
 
 CMD ["dumb-init", "/launch.sh", "init"]

docker/pgbouncer/Dockerfile

@@ -6,11 +6,12 @@ ARG CONTAINERIMAGE
 FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} AS builder
 
 ARG PACKAGER
+ARG PGBOUNCER_VERSION
 
 RUN ${PACKAGER} -y install --nodocs  \
 		--setopt=skip_missing_names_on_install=False \
 		dumb-init \ 
-		pgbouncer \
+		"pgbouncer-${PGBOUNCER_VERSION}.*" \
 		&& ${PACKAGER} -y autoremove \
 		&& ${PACKAGER} -y clean dbcache \
 		&& ${PACKAGER} -y clean all;

docker/postgres-gis/Dockerfile

@@ -74,7 +74,7 @@ COPY cron_unprivileged.c /package/
     #&& 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 kazoo meld3 boto python-etcd psutil requests cdiff ydiff --upgrade \
+RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python-etcd psutil requests cdiff ydiff==1.3 --upgrade \
     && if [[ $PATRONI_VERSION == "multisite-"* ]]; then \
         git clone -b $PATRONI_VERSION https://github.com/cybertec-postgresql/patroni; \
         pip3 install ./patroni[kubernetes,etcd,etcd3]; \
@@ -126,9 +126,8 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
     && cd admin/runit-2.1.2 && package/install \
     && ln -s /usr/local/bin/runsvdir /usr/bin/runsvdir \
     && rm -rf /pg_permissions /pgextwlist /pg_stat_kcache /pgnodemx /timescaledb /set_user /pam-oauth2 \
-    && rm /etc/pgbackrest.conf && rm -rf /var/spool/pgbackrest;
-
-    RUN ${PACKAGER} -y remove $(rpm -qa "*devel*") python3-pip python3-wheel python3-dev python3-setuptools git patchutils flatpak glibc-static gcc glibc-devel --exclude libgeotiff17-devel --exclude libtiff-devel --exclude libspatialite50-devel \
+    && rm /etc/pgbackrest.conf && rm -rf /var/spool/pgbackrest \
+    && ${PACKAGER} -y remove $(rpm -qa "*devel*") python3-pip python3-wheel python3-dev python3-setuptools git patchutils flatpak glibc-static gcc glibc-devel --exclude libgeotiff17-devel --exclude libtiff-devel --exclude libspatialite50-devel \
     && ${PACKAGER} -y autoremove \
     && ${PACKAGER} -y clean dbcache \
     && ${PACKAGER} -y clean all;
@@ -205,6 +204,6 @@ COPY launcher/postgres/launch.sh /
 
 ENTRYPOINT ["/scripts/nss_wrapper/nss_wrapper.sh"]
 
-USER 26
+USER postgres
 
 CMD ["/bin/sh", "/launch.sh", "init"]

docker/postgres/Dockerfile

@@ -73,7 +73,7 @@ COPY cron_unprivileged.c /package/
     #&& 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 kazoo meld3 boto python-etcd psutil requests cdiff ydiff --upgrade \
+RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python-etcd psutil requests cdiff ydiff==1.3 --upgrade \
     && if [[ $PATRONI_VERSION == "multisite-"* ]]; then \
         git clone -b $PATRONI_VERSION https://github.com/cybertec-postgresql/patroni; \
         pip3 install ./patroni[kubernetes,etcd,etcd3]; \
@@ -201,6 +201,6 @@ COPY launcher/postgres/launch.sh /
 
 ENTRYPOINT ["/scripts/nss_wrapper/nss_wrapper.sh"]
 
-USER 26
+USER postgres
 
 CMD ["/bin/sh", "/launch.sh", "init"]