upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-20 19:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Clair base images

Browse Source 
1>update clair base iamges to vmware/photon:1.0
2>update oss packages to latest
This commit is contained in:
yixingj 2017-10-30 17:04:14 +08:00
parent d8919f4da9
commit 651cb81389
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -92,7 +92,7 @@ REBUILDCLARITYFLAG=false
NEWCLARITYVERSION= NEWCLARITYVERSION=
#clair parameters #clair parameters
CLAIRVERSION=v2.0.1-photon CLAIRVERSION=v2.0.1
CLAIRFLAG=false CLAIRFLAG=false
CLAIRDBVERSION=9.6.5-photon CLAIRDBVERSION=9.6.5-photon
@ -247,7 +247,7 @@ ifeq ($(NOTARYFLAG), true)
DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME)
endif endif
ifeq ($(CLAIRFLAG), true) ifeq ($(CLAIRFLAG), true)
DOCKERSAVE_PARA+= vmware/clair:$(CLAIRVERSION) vmware/postgresql:$(CLAIRDBVERSION) DOCKERSAVE_PARA+= vmware/clair-photon:$(CLAIRVERSION) vmware/postgresql:$(CLAIRDBVERSION)
PACKAGE_OFFLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME) PACKAGE_OFFLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME)
PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME) PACKAGE_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME)
DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSECLAIRFILENAME) DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSECLAIRFILENAME)
@ -375,7 +375,7 @@ package_offline: compile build modify_sourcefiles modify_composefile
fi fi
@if [ "$(CLAIRFLAG)" = "true" ] ; then \ @if [ "$(CLAIRFLAG)" = "true" ] ; then \
echo "pulling claiy and postgres..."; \ echo "pulling claiy and postgres..."; \
$(DOCKERPULL) vmware/clair:$(CLAIRVERSION); \ $(DOCKERPULL) vmware/clair-photon:$(CLAIRVERSION); \
$(DOCKERPULL) vmware/postgresql:$(CLAIRDBVERSION); \ $(DOCKERPULL) vmware/postgresql:$(CLAIRDBVERSION); \
fi fi
@if [ "$(MIGRATORFLAG)" = "true" ] ; then \ @if [ "$(MIGRATORFLAG)" = "true" ] ; then \

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

@ -35,7 +35,7 @@ services:
networks: networks:
- harbor-clair - harbor-clair
container_name: clair container_name: clair
image: vmware/clair:v2.0.1-photon image: vmware/clair-photon:v2.0.1
restart: always restart: always
cpu_quota: 150000 cpu_quota: 150000
depends_on: depends_on: