Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 02:05:41 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade the internal PostgreSQL to 14 in 2.9.0 (#18612)

Browse Source 
Fix #18338

Signed-off-by: Yang Jiao <jiaoya@vmware.com>
Co-authored-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
Yang Jiao 2023-05-05 10:32:39 +08:00 committed by GitHub
parent 0a3509f8a7
commit aaea068cce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/photon/db/Dockerfile
View File

@ -14,7 +14,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"]
ENTRYPOINT ["/docker-entrypoint.sh", "13", "14"]
HEALTHCHECK CMD ["/docker-healthcheck.sh"]
USER postgres
USER postgres

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

@ -2,7 +2,7 @@ FROM photon:4.0
ENV PGDATA /var/lib/postgresql/data
RUN tdnf install -y shadow gzip postgresql13 findutils bc >> /dev/null \
RUN tdnf install -y shadow gzip postgresql13 postgresql findutils bc >> /dev/null \
&& groupadd -r postgres --gid=999 \
&& useradd -m -r -g postgres --uid=999 postgres \
&& mkdir -p /docker-entrypoint-initdb.d \
@ -10,8 +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/postgresql.conf.sample \
&& sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
&& 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 \
&& tdnf clean all
RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools

4
make/photon/db/docker-entrypoint.sh
View File

@ -14,7 +14,7 @@ PGDATANEW=${PGDATA}/pg${PG_VERSION_NEW}
# We should block the upgrade path from 9.6 directly.
if [ -s $PGDATA/PG_VERSION ]; then
echo "Upgrading from PostgreSQL 9.6 to PostgreSQL $PG_VERSION_NEW is not supported in the current Harbor release."
echo "Upgrading from PostgreSQL 9.6 to PostgreSQL $PG_VERSION_NEW is not supported in the current Harbor release."
echo "You should upgrade to previous Harbor firstly, then upgrade to current release."
exit 1
fi
@ -56,7 +56,7 @@ if [ ! -s $PGDATANEW/PG_VERSION ]; then
rm -rf $PGDATAOLD
else
echo "init DB, DB version:$PG_VERSION_NEW"
initPG $PGDATANEW true
initPG $PGDATANEW true
fi
fi