[cherry-pick]Update DB Dockerfile.base (goharbor#18247)

Update DB Dockerfile.base 1. Update the path to postgresql.conf.sample as it has changed in postgresql 13.10 2. Remove creating symbolic link as it already exists in postgresql 13.10 Signed-off-by: Yang Jiao <[email protected]>
pivotal · Feb 20, 2023 · 77903fa · 77903fa
1 parent 250a7de
commit 77903fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/make/photon/db/Dockerfile.base b/make/photon/db/Dockerfile.base
@@ -10,9 +10,8 @@ RUN tdnf install -y shadow gzip postgresql13 findutils bc >> /dev/null \
     && chown -R postgres:postgres /run/postgresql \
     && chmod 2777 /run/postgresql \
     && mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \
-    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/13/share/postgresql.conf.sample \
-    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql.conf.sample \
-    && ln -s /usr/pgsql/13/bin/* /usr/bin/ \
+    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
+    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
     && tdnf clean all
 
 RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools
diff --git a/make/photon/db/Dockerfile.pg96 b/make/photon/db/Dockerfile.pg96
@@ -15,9 +15,8 @@ RUN tdnf install -y /pg96/postgresql96-libs-9.6.21-1.ph4.x86_64.rpm /pg96/postgr
     && chown -R postgres:postgres /run/postgresql \
     && chmod 2777 /run/postgresql \
     && mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \
-    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/13/share/postgresql.conf.sample \
-    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql.conf.sample \
-    && ln -s /usr/pgsql/13/bin/* /usr/bin/ \
+    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
+    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
     && tdnf clean all
 
-RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools
+RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools