upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-07 21:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump Clair to v2.0.5

Browse Source 
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>
This commit is contained in:
Daniel Jiang 2018-08-31 15:59:56 +08:00
parent 22c53d9f34
commit 823a9d11e9
4 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

@ -101,7 +101,7 @@ REGISTRYVERSION=v2.6.2
NGINXVERSION=$(VERSIONTAG) NGINXVERSION=$(VERSIONTAG)
NOTARYVERSION=v0.6.1 NOTARYVERSION=v0.6.1
MARIADBVERSION=$(VERSIONTAG) MARIADBVERSION=$(VERSIONTAG)
CLAIRVERSION=v2.0.4 CLAIRVERSION=v2.0.5
CLAIRDBVERSION=$(VERSIONTAG) CLAIRDBVERSION=$(VERSIONTAG)
MIGRATORVERSION=$(VERSIONTAG) MIGRATORVERSION=$(VERSIONTAG)
REDISVERSION=$(VERSIONTAG) REDISVERSION=$(VERSIONTAG)

2
make/harbor.cfg
View File

@ -174,7 +174,7 @@ clair_db_username = postgres
clair_db = postgres clair_db = postgres
#The interval of clair updaters, the unit is hour, set to 0 to disable the updaters. #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############ ##########End of Clair DB configuration############

2
make/photon/Makefile
View File

@ -125,7 +125,7 @@ _build_clair:
@if [ "$(CLAIRFLAG)" = "true" ] ; then \ @if [ "$(CLAIRFLAG)" = "true" ] ; then \
if [ "$(BUILDBIN)" != "true" ] ; then \ if [ "$(BUILDBIN)" != "true" ] ; then \
rm -rf $(DOCKERFILEPATH_CLAIR)/binary && mkdir -p $(DOCKERFILEPATH_CLAIR)/binary && \ 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 \ else \
cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION); \ cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION); \
fi ; \ fi ; \

3
make/photon/clair/builder
View File

@ -20,7 +20,8 @@ cur=$PWD
# the temp folder to store distribution source code... # the temp folder to store distribution source code...
TEMP=`mktemp -d /$TMPDIR/clair.XXXXXX` 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...' echo 'build the clair binary bases on the golang:1.7.3...'
cp Dockerfile.binary $TEMP cp Dockerfile.binary $TEMP