From 63dc0eefc2a40ffbc0bf661057c41ab4c968181b Mon Sep 17 00:00:00 2001 From: Yang Jiao Date: Wed, 12 Jan 2022 07:40:21 +0000 Subject: [PATCH] Specify postgresql version to 13 Signed-off-by: Yang Jiao --- .buildbaselog | 3 +++ make/photon/db/Dockerfile.pg96 | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.buildbaselog b/.buildbaselog index 40cf1b009..c67c66e09 100644 --- a/.buildbaselog +++ b/.buildbaselog @@ -8,6 +8,9 @@ * Add date here... Add signature here... - Add your reason here... +* Jan 14 2022 +- Refresh base image + * Dec 10 2021 - Refresh base image diff --git a/make/photon/db/Dockerfile.pg96 b/make/photon/db/Dockerfile.pg96 index 5dbd0eb9e..00d65be39 100644 --- a/make/photon/db/Dockerfile.pg96 +++ b/make/photon/db/Dockerfile.pg96 @@ -7,7 +7,7 @@ COPY ./make/photon/db/postgresql96-9.6.21-1.ph4.x86_64.rpm /pg96/ RUN tdnf install -y /pg96/postgresql96-libs-9.6.21-1.ph4.x86_64.rpm /pg96/postgresql96-9.6.21-1.ph4.x86_64.rpm >> /dev/null \ && rm -rf /pg96 \ - && tdnf install -y shadow gzip postgresql findutils bc >> /dev/null \ + && tdnf install -y shadow gzip postgresql13 findutils bc >> /dev/null \ && groupadd -r postgres --gid=999 \ && useradd -m -r -g postgres --uid=999 postgres \ && mkdir -p /docker-entrypoint-initdb.d \ @@ -15,8 +15,9 @@ 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/share/postgresql/postgresql.conf.sample \ - && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \ + && 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/ \ && tdnf clean all RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools \ No newline at end of file