upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 14:56:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16213 from YangJiao0817/specify-pgsqlversion13-2.3

Browse Source 
[cherry-pick]Specify postgresql version to 13
This commit is contained in:
Yang Jiao 2022-01-20 10:51:45 +08:00 committed by GitHub
commit 1fa8fee58c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.buildbaselog
View File

@ -8,6 +8,9 @@
* Add date here... Add signature here...
- Add your reason here...
* Jan 18 2022 <jiaoya@vmware.com>
- Refresh base image
* Nov 26 2021 <jiaoya@vmware.com>
- Refresh base image

7
make/photon/db/Dockerfile.pg96
View File

@ -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