Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-20 14:41:28 +01:00
Code Issues Projects Releases Wiki Activity

update make file and docker compose template

Browse Source
This commit is contained in:
Tan Jiang 2017-03-22 20:56:08 +08:00
parent f9180c0c96
commit 44cd3ec85b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -79,7 +79,7 @@ REGISTRYSERVER=
REGISTRYPROJECTNAME=vmware REGISTRYPROJECTNAME=vmware
DEVFLAG=true DEVFLAG=true
NOTARYFLAG=false NOTARYFLAG=false
REGISTRYVERSION=2.6.0 REGISTRYVERSION=photon-2.6.0
NGINXVERSION=1.11.5 NGINXVERSION=1.11.5
PHOTONVERSION=1.0 PHOTONVERSION=1.0
NOTARYVERSION=server-0.5.0 NOTARYVERSION=server-0.5.0
@ -262,7 +262,7 @@ build: build_$(BASEIMAGE)
modify_composefile: modify_composefile:
@echo "preparing docker-compose file..." @echo "preparing docker-compose file..."
@cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSETPLFILENAME) $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) @cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSETPLFILENAME) $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
@$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) @$(SEDCMD) -i 's/__version__/$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
install: compile build prepare modify_composefile start install: compile build prepare modify_composefile start
@ -318,7 +318,7 @@ package_offline: compile build modify_composefile
$(DOCKERIMAGENAME_LOG):$(VERSIONTAG) \ $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) \
$(DOCKERIMAGENAME_DB):$(VERSIONTAG) \ $(DOCKERIMAGENAME_DB):$(VERSIONTAG) \
$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \ $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
nginx:$(NGINXVERSION) registry:$(REGISTRYVERSION) photon:$(PHOTONVERSION) \ nginx:$(NGINXVERSION) vmware/registry:$(REGISTRYVERSION) photon:$(PHOTONVERSION) \
vmware/notary-photon:$(NOTARYVERSION) vmware/notary-photon:$(NOTARYSIGNERVERSION) mariadb:$(MARIADBVERSION); \ vmware/notary-photon:$(NOTARYVERSION) vmware/notary-photon:$(NOTARYSIGNERVERSION) mariadb:$(MARIADBVERSION); \
else \ else \
$(DOCKERSAVE) -o $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tgz \ $(DOCKERSAVE) -o $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tgz \

10
make/docker-compose.tpl
View File

@ -1,7 +1,7 @@
version: '2' version: '2'
services: services:
log: log:
image: vmware/harbor-log image: vmware/harbor-log:__version__
container_name: harbor-log container_name: harbor-log
restart: always restart: always
volumes: volumes:
@ -31,7 +31,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "registry" tag: "registry"
mysql: mysql:
image: vmware/harbor-db image: vmware/harbor-db:__version__
container_name: harbor-db container_name: harbor-db
restart: always restart: always
volumes: volumes:
@ -48,7 +48,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "mysql" tag: "mysql"
adminserver: adminserver:
image: vmware/harbor-adminserver image: vmware/harbor-adminserver:__version__
container_name: harbor-adminserver container_name: harbor-adminserver
env_file: env_file:
- ./common/config/adminserver/env - ./common/config/adminserver/env
@ -66,7 +66,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "adminserver" tag: "adminserver"
ui: ui:
image: vmware/harbor-ui image: vmware/harbor-ui:__version__
container_name: harbor-ui container_name: harbor-ui
env_file: env_file:
- ./common/config/ui/env - ./common/config/ui/env
@ -88,7 +88,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "ui" tag: "ui"
jobservice: jobservice:
image: vmware/harbor-jobservice image: vmware/harbor-jobservice:__version__
container_name: harbor-jobservice container_name: harbor-jobservice
env_file: env_file:
- ./common/config/jobservice/env - ./common/config/jobservice/env