From 3dc0f65fb3a4eaa5ce3ccc6bb533f5f90d1e178e Mon Sep 17 00:00:00 2001
From: yixingj <yixingj@vmware.com>
Date: Thu, 12 Oct 2017 17:08:47 +0800
Subject: [PATCH] Update OSS in postgresql image

1> update OSS in postgresql image
2> update postgresql to 9.6.5
---
 Makefile                          | 2 +-
 make/common/postgresql/Dockerfile | 6 ++++--
 make/docker-compose.clair.yml     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 2d70c96b1..f699945f9 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ NEWCLARITYVERSION=
 #clair parameters
 CLAIRVERSION=v2.0.1-photon
 CLAIRFLAG=false
-CLAIRDBVERSION=9.6.4-photon
+CLAIRDBVERSION=9.6.5-photon
 
 #clarity parameters
 CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag]
diff --git a/make/common/postgresql/Dockerfile b/make/common/postgresql/Dockerfile
index ca9bc9689..37fbc1095 100644
--- a/make/common/postgresql/Dockerfile
+++ b/make/common/postgresql/Dockerfile
@@ -1,8 +1,9 @@
-FROM library/photon:1.0
+FROM vmware/photon:1.0
 
 ENV PGDATA /var/lib/postgresql/data
 
 RUN touch /etc/localtime.bak \
+    && tdnf distro-sync -y \
     && tdnf install -y sed shadow gzip postgresql\
     && groupadd -r postgres --gid=999 \
     && 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|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \
     && 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
 
diff --git a/make/docker-compose.clair.yml b/make/docker-compose.clair.yml
index 0635542f5..fc2399f46 100644
--- a/make/docker-compose.clair.yml
+++ b/make/docker-compose.clair.yml
@@ -17,7 +17,7 @@ services:
         aliases:
           - postgres
     container_name: clair-db
-    image: vmware/postgresql:9.6.4-photon
+    image: vmware/postgresql:9.6.5-photon
     restart: always
     depends_on:
       - log