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

remove tag in docker-compose.yml

This commit is contained in:
yhua 2016-10-26 13:04:52 +08:00
parent fa703e58b5
commit 03e2a3ee56
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -86,7 +86,7 @@ script:
- docker-compose -f make/docker-compose.test.yml down - docker-compose -f make/docker-compose.test.yml down
- docker-compose -f make/docker-compose.yml up -d - docker-compose -f make/dev/docker-compose.yml up -d
- docker ps - docker ps
- go run tests/startuptest.go http://localhost/ - go run tests/startuptest.go http://localhost/

15
Makefile
View File

@ -25,7 +25,7 @@
# #
# package_online: # package_online:
# prepare online install package # prepare online install package
# for example: make package_online -e \ # for example: make package_online -e DEVFLAG=flase\
# REGISTRYSERVER=reg-bj.eng.vmware.com \ # REGISTRYSERVER=reg-bj.eng.vmware.com \
# REGISTRYPROJECTNAME=harborrelease # REGISTRYPROJECTNAME=harborrelease
# #
@ -33,13 +33,13 @@
# prepare offline install package # prepare offline install package
# #
# pushimage: push Harbor images to specific registry server # pushimage: push Harbor images to specific registry server
# for example: make pushimage -e REGISTRYUSER=admin \ # for example: make pushimage -e DEVFLAG=flase REGISTRYUSER=admin \
# REGISTRYPASSWORD=***** \ # REGISTRYPASSWORD=***** \
# REGISTRYSERVER=reg-bj.eng.vmware.com/ \ # REGISTRYSERVER=reg-bj.eng.vmware.com/ \
# REGISTRYPROJECTNAME=harborrelease # REGISTRYPROJECTNAME=harborrelease
# note**: need add "/" on end of REGISTRYSERVER. If not setting \ # note**: need add "/" on end of REGISTRYSERVER. If not setting \
# this value will push images directly to dockerhub. # this value will push images directly to dockerhub.
# make pushimage -e REGISTRYUSER=vmware \ # make pushimage -e DEVFLAG=flase REGISTRYUSER=vmware \
# REGISTRYPASSWORD=***** \ # REGISTRYPASSWORD=***** \
# REGISTRYPROJECTNAME=vmware # REGISTRYPROJECTNAME=vmware
# #
@ -141,6 +141,7 @@ DOCKERIMAGENAME_DB=vmware/harbor-db
# docker-compose files # docker-compose files
DOCKERCOMPOSEFILEPATH=$(MAKEPATH) DOCKERCOMPOSEFILEPATH=$(MAKEPATH)
DOCKERCOMPOSETPLFILENAME=docker-compose.tpl
DOCKERCOMPOSEFILENAME=docker-compose.yml DOCKERCOMPOSEFILENAME=docker-compose.yml
# version prepare # version prepare
@ -229,8 +230,8 @@ build: build_$(BASEIMAGE)
modify_composefile: modify_composefile:
@echo "preparing tag:$(VERSIONTAG) docker-compose file..." @echo "preparing tag:$(VERSIONTAG) docker-compose file..."
@cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml @cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSETPLFILENAME) $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
@$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml @$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME)
install: compile build modify_composefile install: compile build modify_composefile
@echo "loading harbor images..." @echo "loading harbor images..."
@ -249,7 +250,7 @@ package_online: modify_composefile
@$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \ @$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \
--exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \ --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \
--exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \ --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \
--exclude=$(HARBORPKG)/dev --exclude=docker-compose.yml \ --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \
--exclude=$(HARBORPKG)/checkenv.sh \ --exclude=$(HARBORPKG)/checkenv.sh \
--exclude=$(HARBORPKG)/jsminify.sh \ --exclude=$(HARBORPKG)/jsminify.sh \
--exclude=$(HARBORPKG)/pushimage.sh \ --exclude=$(HARBORPKG)/pushimage.sh \
@ -275,7 +276,7 @@ package_offline: compile build modify_composefile
@$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \ @$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \
--exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \ --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \
--exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \ --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \
--exclude=$(HARBORPKG)/dev --exclude=docker-compose.yml \ --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \
--exclude=$(HARBORPKG)/checkenv.sh \ --exclude=$(HARBORPKG)/checkenv.sh \
--exclude=$(HARBORPKG)/jsminify.sh \ --exclude=$(HARBORPKG)/jsminify.sh \
--exclude=$(HARBORPKG)/pushimage.sh \ --exclude=$(HARBORPKG)/pushimage.sh \

2
make/docker-compose.yml → make/docker-compose.tpl
View File

@ -74,7 +74,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "jobservice" tag: "jobservice"
proxy: proxy:
image: nginx:1.9.0 image: nginx:1.9
container_name: nginx container_name: nginx
restart: always restart: always
volumes: volumes: