diff --git a/make/photon/db/Dockerfile b/make/photon/db/Dockerfile index c5ce0aae8..c9e3313c4 100644 --- a/make/photon/db/Dockerfile +++ b/make/photon/db/Dockerfile @@ -12,7 +12,7 @@ COPY ./make/photon/db/initial-registry.sql /docker-entrypoint-initdb.d/ RUN chown -R postgres:postgres /docker-entrypoint.sh /docker-healthcheck.sh /docker-entrypoint-initdb.d \ && chmod u+x /docker-entrypoint.sh /docker-healthcheck.sh -ENTRYPOINT ["/docker-entrypoint.sh", "13", "14"] +ENTRYPOINT ["/docker-entrypoint.sh", "14", "15"] HEALTHCHECK CMD ["/docker-healthcheck.sh"] USER postgres diff --git a/make/photon/db/Dockerfile.base b/make/photon/db/Dockerfile.base index a32c0d65e..6c816cc81 100644 --- a/make/photon/db/Dockerfile.base +++ b/make/photon/db/Dockerfile.base @@ -6,15 +6,15 @@ RUN tdnf install -y shadow >> /dev/null \ && groupadd -r postgres --gid=999 \ && useradd -m -r -g postgres --uid=999 postgres -RUN tdnf install -y postgresql13-server >> /dev/null -RUN tdnf install -y gzip postgresql14-server findutils bc >> /dev/null \ +RUN tdnf install -y postgresql14-server >> /dev/null +RUN tdnf install -y gzip postgresql15-server findutils bc >> /dev/null \ && mkdir -p /docker-entrypoint-initdb.d \ && mkdir -p /run/postgresql \ && 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/14/share/postgresql/postgresql.conf.sample \ - && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/14/share/postgresql/postgresql.conf.sample \ + && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/15/share/postgresql/postgresql.conf.sample \ + && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/15/share/postgresql/postgresql.conf.sample \ && tdnf clean all RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools