Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-25 03:35:21 +01:00
Code Issues Projects Releases Wiki Activity

Bump up PostgreSQL from 14 to 15 (#19789)

Browse Source 
Fix #19512

Signed-off-by: Yang Jiao <yang.jiao@broadcom.com>
Co-authored-by: Yang Jiao <yang.jiao@broadcom.com>
This commit is contained in:
Yang Jiao 2024-01-04 14:01:00 +08:00 committed by GitHub
parent ed4587b491
commit aefe1bce9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/photon/db/Dockerfile
View File

@ -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 \ RUN chown -R postgres:postgres /docker-entrypoint.sh /docker-healthcheck.sh /docker-entrypoint-initdb.d \
&& chmod u+x /docker-entrypoint.sh /docker-healthcheck.sh && 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"] HEALTHCHECK CMD ["/docker-healthcheck.sh"]
USER postgres USER postgres

8
make/photon/db/Dockerfile.base
View File

@ -6,15 +6,15 @@ RUN tdnf install -y shadow >> /dev/null \
&& groupadd -r postgres --gid=999 \ && groupadd -r postgres --gid=999 \
&& useradd -m -r -g postgres --uid=999 postgres && useradd -m -r -g postgres --uid=999 postgres
RUN tdnf install -y postgresql13-server >> /dev/null RUN tdnf install -y postgresql14-server >> /dev/null
RUN tdnf install -y gzip postgresql14-server findutils bc >> /dev/null \ RUN tdnf install -y gzip postgresql15-server findutils bc >> /dev/null \
&& mkdir -p /docker-entrypoint-initdb.d \ && mkdir -p /docker-entrypoint-initdb.d \
&& mkdir -p /run/postgresql \ && mkdir -p /run/postgresql \
&& chown -R postgres:postgres /run/postgresql \ && chown -R postgres:postgres /run/postgresql \
&& chmod 2777 /run/postgresql \ && chmod 2777 /run/postgresql \
&& mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \ && 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|#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/14/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 && 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