From 471c1a35822480bff48f4ba76a84ffbc40642310 Mon Sep 17 00:00:00 2001 From: Viacheslav Sarzhan Date: Sat, 14 Sep 2024 11:38:53 +0300 Subject: [PATCH] percona-pgbackrest rpm creats postgres user --- postgresql-containers/build/pgbackrest-repo/Dockerfile | 9 +-------- postgresql-containers/build/pgbackrest/Dockerfile | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/postgresql-containers/build/pgbackrest-repo/Dockerfile b/postgresql-containers/build/pgbackrest-repo/Dockerfile index d1823f33..a862a026 100644 --- a/postgresql-containers/build/pgbackrest-repo/Dockerfile +++ b/postgresql-containers/build/pgbackrest-repo/Dockerfile @@ -111,15 +111,8 @@ 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; \ + usermod -d /home/postgres postgres; \ groupadd pgbackrest -g 2000; \ useradd pgbackrest -u 2000 -g 2000 diff --git a/postgresql-containers/build/pgbackrest/Dockerfile b/postgresql-containers/build/pgbackrest/Dockerfile index eca9e189..fcca51d8 100644 --- a/postgresql-containers/build/pgbackrest/Dockerfile +++ b/postgresql-containers/build/pgbackrest/Dockerfile @@ -102,15 +102,8 @@ RUN set -ex; \ percona-pgbackrest; \ microdnf -y clean all -# 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; \ + usermod -d /home/postgres postgres; \ mkdir -p /opt/crunchy/bin /opt/crunchy/conf /pgdata /backrestrepo \ /var/log/pgbackrest