Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 10:15:35 +01:00
Code Issues Projects Releases Wiki Activity

Clair photon (#2721)

Browse Source 
* update

* update

* modify docker compose

* update tag

* update
This commit is contained in:
Yan 2017-07-10 21:00:44 -07:00 committed by GitHub
parent 6fa12cdb1e
commit 7040e5ad5a
3 changed files with 17 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 CLAIRVERSION=v2.0.1-photon
CLAIRFLAG=false CLAIRFLAG=false
CLAIRDBVERSION=9.6.3-photon CLAIRDBVERSION=9.6.3-photon
@ -243,7 +243,7 @@ ifeq ($(NOTARYFLAG), true)
DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME) DOCKERCOMPOSE_LIST+= -f $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSENOTARYFILENAME)
endif endif
ifeq ($(CLAIRFLAG), true) ifeq ($(CLAIRFLAG), true)
DOCKERSAVE_PARA+= quay.io/coreos/clair:$(CLAIRVERSION) vmware/postgresql:$(CLAIRDBVERSION) DOCKERSAVE_PARA+= vmware/clair:$(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)
@ -368,7 +368,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) quay.io/coreos/clair:$(CLAIRVERSION); \ $(DOCKERPULL) vmware/clair:$(CLAIRVERSION); \
$(DOCKERPULL) vmware/postgresql:$(CLAIRDBVERSION); \ $(DOCKERPULL) vmware/postgresql:$(CLAIRDBVERSION); \
fi fi

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: quay.io/coreos/clair:v2.0.1 image: vmware/clair:v2.0.1-photon
restart: always restart: always
depends_on: depends_on:
- postgres - postgres

13
make/photon/clair/Dockerfile Normal file
View File

@ -0,0 +1,13 @@
FROM library/photon:1.0
RUN tdnf install -y git bzr rpm xz \
&& mkdir /clair2.0.1/
COPY clair /clair2.0.1/
VOLUME /config
EXPOSE 6060 6061
RUN chmod u+x /clair2.0.1/clair
ENTRYPOINT ["/clair2.0.1/clair"]