Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3482 from yixingjia/ossclairupdate 

Update Clair base images
This commit is contained in:
Daniel Jiang 2017-11-02 14:23:33 +08:00 committed by GitHub
parent 83b0000d71 651cb81389
commit f7967e22ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 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=
#clair parameters
CLAIRVERSION=v2.0.1-photon
CLAIRVERSION=v2.0.1
CLAIRFLAG=false
CLAIRDBVERSION=9.6.5-photon
@ -247,7 +247,7 @@ ifeq ($(NOTARYFLAG), true)
DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME)
endif
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_ONLINE_PARA+= $(HARBORPKG)/$(DOCKERCOMPOSECLAIRFILENAME)
DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSECLAIRFILENAME)
@ -375,7 +375,7 @@ package_offline: compile build modify_sourcefiles modify_composefile
fi
@if [ "$(CLAIRFLAG)" = "true" ] ; then \
echo "pulling claiy and postgres..."; \
$(DOCKERPULL) vmware/clair:$(CLAIRVERSION); \
$(DOCKERPULL) vmware/clair-photon:$(CLAIRVERSION); \
$(DOCKERPULL) vmware/postgresql:$(CLAIRDBVERSION); \
fi
@if [ "$(MIGRATORFLAG)" = "true" ] ; then \

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

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

7
make/photon/clair/Dockerfile
View File

@ -1,6 +1,9 @@
FROM library/photon:1.0
FROM vmware/photon:1.0
RUN tdnf install -y git bzr rpm xz \
RUN tdnf distro-sync -y \
&& tdnf erase vim -y \
&& tdnf install -y git bzr rpm xz \
&& tdnf clean all \
&& mkdir /clair2.0.1/
COPY clair /clair2.0.1/