K8SPG-254 in PG16.3 percona-pgbackrest rpm creats postgres user (percona#979)

hors · web-flow · commit dfb08c363f47 · 2024-06-06T19:56:10.000+03:00
diff --git a/postgresql-containers/build/pgbackrest-repo/Dockerfile b/postgresql-containers/build/pgbackrest-repo/Dockerfile
@@ -111,9 +111,15 @@ COPY --from=go_builder /licenses /licenses
 COPY bin/common /opt/crunchy/bin
 COPY bin/pgbackrest-common /opt/crunchy/bin
 
+# only PG16 is affected PG-794
+RUN if [[ "${PG_MAJOR//.}" -le '15' ]]; then \
+        groupadd postgres -g 26; \
+        useradd postgres -u 26 -g 26; \
+    else \
+        usermod -d /home/postgres postgres; \
+    fi
+
 RUN set -ex; \
-    groupadd postgres -g 26; \
-    useradd postgres -u 26 -g 26; \
     groupadd pgbackrest -g 2000; \
     useradd pgbackrest -u 2000 -g 2000
 
diff --git a/postgresql-containers/build/pgbackrest/Dockerfile b/postgresql-containers/build/pgbackrest/Dockerfile
@@ -102,9 +102,13 @@ RUN set -ex; \
         percona-pgbackrest; \
     microdnf -y clean all
 
-RUN set -ex; \
-    groupadd postgres -g 26; \
-    useradd postgres -u 26 -g 26
+# only PG16 is affected PG-794
+RUN if [[ "${PG_MAJOR//.}" -le '15' ]]; then \
+        groupadd postgres -g 26; \
+        useradd postgres -u 26 -g 26; \
+    else \
+        usermod -d /home/postgres postgres; \
+    fi
 
 RUN set -ex; \
     mkdir -p /opt/crunchy/bin /opt/crunchy/conf /pgdata /backrestrepo \
