Merge pull request #75 from cybertec-postgresql/buildFix

fix_pgbackrest_install_error

Author: Schmaetz

docker/pgbackrest-public-beta/Dockerfile

@@ -27,14 +27,14 @@ RUN ${PACKAGER} -y install --nodocs  \
 		libicu \
 		dumb-init \
 		jq \
-		pgbackrest-${PGBACKREST_VERSION} \
 	&& ${PACKAGER} -y clean all ; 
 
 # Install postgres-server
 RUN ${PACKAGER} -y update \
 	&& for version in $PG_SUPPORTED_VERSIONS; do \
 		${PACKAGER} -y install --nodocs postgresql${version}-server; \
     done \
+	&& ${PACKAGER} -y install pgbackrest-${PGBACKREST_VERSION} \
 	&& ${PACKAGER} -y clean all;
 
 # Remove default pgbackrest-config

docker/pgbackrest/Dockerfile

@@ -23,14 +23,14 @@ RUN ${PACKAGER} -y install --nodocs  \
 		libicu \
 		dumb-init \
 		jq \
-		pgbackrest-${PGBACKREST_VERSION} \
 	&& ${PACKAGER} -y clean all; 
 
 # Install postgres-server
 RUN ${PACKAGER} -y update \
 	&& for version in $PG_SUPPORTED_VERSIONS; do \
 		${PACKAGER} -y install --nodocs postgresql${version}-server; \
     done \
+	&& ${PACKAGER} -y install pgbackrest-${PGBACKREST_VERSION} \
 	&& ${PACKAGER} -y clean all;
 
 # Remove default pgbackrest-config

docker/postgres-gis/Dockerfile

@@ -53,7 +53,6 @@ RUN ${PACKAGER} -y update && ${PACKAGER} -y install --nodocs --noplugins --setop
         rsync \
         dumb-init \ 
         libicu \
-        pgbackrest-${PGBACKREST_VERSION} \
         cronie \
         libcurl-devel \
 		&& ${PACKAGER} -y clean all;
@@ -110,6 +109,7 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
             && cd /pgextwlist && make clean && make && make install \
             && cd /pgnodemx && make USE_PGXS=1 clean && make USE_PGXS=1 && make USE_PGXS=1 install; \
     done \
+    && ${PACKAGER} -y install pgbackrest-${PGBACKREST_VERSION} \
     && ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 glibc-static \
     && ${PACKAGER} -y clean all;
     RUN gcc -s -shared -fPIC -o /usr/local/lib/cron_unprivileged.so /package/cron_unprivileged.c

docker/postgres/Dockerfile

@@ -52,7 +52,6 @@ RUN ${PACKAGER} -y update && ${PACKAGER} -y install --nodocs --noplugins --setop
         rsync \
         dumb-init \ 
         libicu \
-        pgbackrest-${PGBACKREST_VERSION} \
         cronie \
         libcurl-devel \
 		&& ${PACKAGER} -y clean all;
@@ -107,6 +106,7 @@ RUN pip3 install 'PyYAML<6.0' setuptools pystache loader kazoo meld3 boto python
             && cd /pgextwlist && make clean && make && make install \
             && cd /pgnodemx && make USE_PGXS=1 clean && make USE_PGXS=1 && make USE_PGXS=1 install; \
     done \
+    && ${PACKAGER} -y install pgbackrest-${PGBACKREST_VERSION} \
     && ${PACKAGER} -y install --nodocs --noplugins --setopt=install_weak_deps=0 glibc-static \
     && ${PACKAGER} -y clean all;
     RUN gcc -s -shared -fPIC -o /usr/local/lib/cron_unprivileged.so /package/cron_unprivileged.c