From 823a9d11e98d06f6ae9932537bc286f147582b35 Mon Sep 17 00:00:00 2001
From: Daniel Jiang <jiangd@vmware.com>
Date: Fri, 31 Aug 2018 15:59:56 +0800
Subject: [PATCH] Bump Clair to v2.0.5

The PR to fix the Alpine issue has been merged to Clair's release-2.0
branch, and released v2.0.5.
This commit updates Harbor to include that change and re-enable
Clair's updaters by default.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
---
 Makefile                  | 2 +-
 make/harbor.cfg           | 2 +-
 make/photon/Makefile      | 2 +-
 make/photon/clair/builder | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7bbda11bf..8f1200939 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ REGISTRYVERSION=v2.6.2
 NGINXVERSION=$(VERSIONTAG)
 NOTARYVERSION=v0.6.1
 MARIADBVERSION=$(VERSIONTAG)
-CLAIRVERSION=v2.0.4
+CLAIRVERSION=v2.0.5
 CLAIRDBVERSION=$(VERSIONTAG)
 MIGRATORVERSION=$(VERSIONTAG)
 REDISVERSION=$(VERSIONTAG)
diff --git a/make/harbor.cfg b/make/harbor.cfg
index 585b9d007..69fd19e56 100644
--- a/make/harbor.cfg
+++ b/make/harbor.cfg
@@ -174,7 +174,7 @@ clair_db_username = postgres
 clair_db = postgres
 
 #The interval of clair updaters, the unit is hour, set to 0 to disable the updaters.
-clair_updaters_interval = 0
+clair_updaters_interval = 12
 
 ##########End of Clair DB configuration############
 
diff --git a/make/photon/Makefile b/make/photon/Makefile
index d74590829..94ea817ee 100644
--- a/make/photon/Makefile
+++ b/make/photon/Makefile
@@ -125,7 +125,7 @@ _build_clair:
 	@if [ "$(CLAIRFLAG)" = "true" ] ; then \
 		if [ "$(BUILDBIN)" != "true" ] ; then \
 			rm -rf $(DOCKERFILEPATH_CLAIR)/binary && mkdir -p $(DOCKERFILEPATH_CLAIR)/binary && \
-			$(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/clair, $(DOCKERFILEPATH_CLAIR)/binary/clair); \
+			$(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/clair/release2.0-$(CLAIRVERSION)/clair, $(DOCKERFILEPATH_CLAIR)/binary/clair); \
 		else \
 			cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION); \
 		fi ; \
diff --git a/make/photon/clair/builder b/make/photon/clair/builder
index 6ce9c07a7..086903f4d 100755
--- a/make/photon/clair/builder
+++ b/make/photon/clair/builder
@@ -20,7 +20,8 @@ cur=$PWD
 
 # the temp folder to store distribution source code...
 TEMP=`mktemp -d /$TMPDIR/clair.XXXXXX`
-git clone -b $VERSION https://github.com/coreos/clair.git $TEMP
+git clone https://github.com/coreos/clair.git $TEMP
+cd $TEMP; git checkout $VERSION; cd -
 
 echo 'build the clair binary bases on the golang:1.7.3...'
 cp Dockerfile.binary $TEMP