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

Update OSS in postgresql image

Browse Source 
1> update OSS in postgresql image
2> update postgresql to 9.6.5
This commit is contained in:
yixingj 2017-10-12 17:08:47 +08:00
parent 4651d264e9
commit 3dc0f65fb3
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -94,7 +94,7 @@ NEWCLARITYVERSION=
#clair parameters #clair parameters
CLAIRVERSION=v2.0.1-photon CLAIRVERSION=v2.0.1-photon
CLAIRFLAG=false CLAIRFLAG=false
CLAIRDBVERSION=9.6.4-photon CLAIRDBVERSION=9.6.5-photon
#clarity parameters #clarity parameters
CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag] CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag]

6
make/common/postgresql/Dockerfile
View File

@ -1,8 +1,9 @@
FROM library/photon:1.0 FROM vmware/photon:1.0
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data
RUN touch /etc/localtime.bak \ RUN touch /etc/localtime.bak \
&& tdnf distro-sync -y \
&& tdnf install -y sed shadow gzip postgresql\ && tdnf install -y sed shadow gzip postgresql\
&& groupadd -r postgres --gid=999 \ && groupadd -r postgres --gid=999 \
&& useradd -r -g postgres --uid=999 postgres \ && useradd -r -g postgres --uid=999 postgres \
@ -14,7 +15,8 @@ RUN touch /etc/localtime.bak \
&& sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/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 \ && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \
&& touch /usr/share/locale/locale.alias \ && touch /usr/share/locale/locale.alias \
&& locale-gen.sh en_US.UTF-8 && locale-gen.sh en_US.UTF-8 \
&& tdnf clean all
VOLUME /var/lib/postgresql/data VOLUME /var/lib/postgresql/data

2
make/docker-compose.clair.yml
View File

@ -17,7 +17,7 @@ services:
aliases: aliases:
- postgres - postgres
container_name: clair-db container_name: clair-db
image: vmware/postgresql:9.6.4-photon image: vmware/postgresql:9.6.5-photon
restart: always restart: always
depends_on: depends_on:
- log - log