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

Merge pull request #16306 from YangJiao0817/specify-pg-version-13in2.3

Browse Source 
[cherry-pick]Specify postgresql version to 13
This commit is contained in:
Yang Jiao 2022-01-27 17:30:50 +08:00 committed by GitHub
commit 6a2b7b3040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -75,7 +75,7 @@ CHECKENVCMD=checkenv.sh
# parameters
# default is true
BUILD_PG96=true
BUILD_PG96=false
REGISTRYSERVER=
REGISTRYPROJECTNAME=goharbor
DEVFLAG=true

7
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 postgresql findutils bc >> /dev/null \
RUN 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 \
@ -10,8 +10,9 @@ RUN tdnf install -y shadow gzip postgresql 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/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