From f391c88da8bb39d59365e3fa15c40a7138baafb1 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sat, 27 Jan 2024 23:21:08 -0500
Subject: [PATCH] Adding usermod to entrypoint.

---
 docker/postgres/Dockerfile            | 3 +++
 docker/postgres/entrypoint.sh         | 9 +++++++++
 docker/postgres/postgresql-13.conf.j2 | 4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 docker/postgres/entrypoint.sh

diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
index 89d244cd3..541189d06 100644
--- a/docker/postgres/Dockerfile
+++ b/docker/postgres/Dockerfile
@@ -4,3 +4,6 @@ RUN apt update && apt install -y openssh-client rsync
 
 RUN usermod -u 1000 postgres
 RUN groupmod -g 1001 postgres
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/postgres/entrypoint.sh b/docker/postgres/entrypoint.sh
new file mode 100644
index 000000000..0c2fbbc40
--- /dev/null
+++ b/docker/postgres/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# entrypoint.sh
+
+# Create a user with the specified UID/GID
+usermod -u 1000 postgres
+groupmod -g 1001 postgres
+
+# Execute the original entrypoint of the image
+exec docker-entrypoint.sh postgres
diff --git a/docker/postgres/postgresql-13.conf.j2 b/docker/postgres/postgresql-13.conf.j2
index 109a4af03..108c23399 100644
--- a/docker/postgres/postgresql-13.conf.j2
+++ b/docker/postgres/postgresql-13.conf.j2
@@ -249,8 +249,8 @@ archive_command = 'test ! -f /var/lib/postgresql/archive/%f && cp -f %p /var/lib
 
 # These are only used in recovery mode.
 
-restore_command = 'rsync -a -e "ssh -i /var/lib/postgresql/.ssh/id_rsa" db-postgres.service.consul:/srv/newsblur/docker/volumes/postgres/archive/%f "%p"'
-# restore_command = 'cp /var/lib/postgresql/archive/%f %p'		# command to use to restore an archived logfile segment
+# restore_command = 'rsync -a -e "ssh -i /var/lib/postgresql/.ssh/id_rsa" db-postgres.service.consul:/srv/newsblur/docker/volumes/postgres/archive/%f "%p"'
+restore_command = 'cp /var/lib/postgresql/archive/%f %p'		# command to use to restore an archived logfile segment
 				# placeholders: %p = path of file to restore
 				#               %f = file name only
 				# e.g. 'cp /mnt/server/archivedir/%f %p'