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

Merge pull request #921 from yhua123/dev

Browse Source 
fix pushimage, update .gitignore, add DEVFLAG
This commit is contained in:
yhua123 2016-10-24 14:14:42 +08:00 committed by GitHub
commit 9a6f072bf9
4 changed files with 66 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.gitignore vendored
View File

@ -1,13 +1,14 @@
harbor harbor
Deploy/config/registry/config.yml make/common/config/registry/config.yml
Deploy/config/ui/env make/common/config/ui/env
Deploy/config/ui/app.conf make/common/config/ui/app.conf
Deploy/config/db/env make/common/config/db/env
Deploy/config/jobservice/env make/common/config/jobservice/env
Deploy/config/nginx/nginx.conf make/common/config/nginx/nginx.conf
Deploy/config/nginx/cert/* make/common/config/nginx/cert/*
Deploy/ui/harbor_ui make/dev/ui/harbor_ui
Deploy/jobservice/harbor_jobservice make/dev//jobservice/harbor_jobservice
ui/ui src/ui/ui
src/jobservice/jobservice
*.pyc *.pyc
jobservice/test jobservice/test

36
Makefile
View File

@ -28,7 +28,6 @@
# for example: make package_online -e \ # for example: make package_online -e \
# REGISTRYSERVER=reg-bj.eng.vmware.com \ # REGISTRYSERVER=reg-bj.eng.vmware.com \
# REGISTRYPROJECTNAME=harborrelease # REGISTRYPROJECTNAME=harborrelease
# note**: DONT add "/" on end of REGISTRYSERVER.
# #
# package_offline: # package_offline:
# prepare offline install package # prepare offline install package
@ -62,6 +61,9 @@
# note**: If commit new code to github, the git commit TAG will \ # note**: If commit new code to github, the git commit TAG will \
# change. Better use this commond clean previous images and \ # change. Better use this commond clean previous images and \
# files with specific TAG. # files with specific TAG.
# By default DEVFLAG=true, if you want to release new version of Harbor, \
# should setting the flag to false.
# make XXXX -e DEVFLAG=flase
SHELL := /bin/bash SHELL := /bin/bash
BUILDPATH=$(CURDIR) BUILDPATH=$(CURDIR)
@ -75,6 +77,7 @@ BASEIMAGE=photon
COMPILETAG=compile_normal COMPILETAG=compile_normal
REGISTRYSERVER= REGISTRYSERVER=
REGISTRYPROJECTNAME=vmware REGISTRYPROJECTNAME=vmware
DEVFLAG=true
# docker parameters # docker parameters
DOCKERCMD=$(shell which docker) DOCKERCMD=$(shell which docker)
@ -128,10 +131,10 @@ DOCKERFILEPATH_DB=$(DOCKERFILEPATH_COMMON)/db
DOCKERFILENAME_DB=Dockerfile DOCKERFILENAME_DB=Dockerfile
# docker image name # docker image name
DOCKERIMAGENAME_UI=$(REGISTRYPROJECTNAME)/harbor-ui DOCKERIMAGENAME_UI=vmware/harbor-ui
DOCKERIMAGENAME_JOBSERVICE=$(REGISTRYPROJECTNAME)/harbor-jobservice DOCKERIMAGENAME_JOBSERVICE=vmware/harbor-jobservice
DOCKERIMAGENAME_LOG=$(REGISTRYPROJECTNAME)/harbor-log DOCKERIMAGENAME_LOG=vmware/harbor-log
DOCKERIMAGENAME_DB=$(REGISTRYPROJECTNAME)/harbor-db DOCKERIMAGENAME_DB=vmware/harbor-db
# docker-compose files # docker-compose files
@ -143,7 +146,12 @@ VERSIONFILEPATH=$(SRCPATH)/ui/views/sections
VERSIONFILENAME=header-content.htm VERSIONFILENAME=header-content.htm
GITCMD=$(shell which git) GITCMD=$(shell which git)
GITTAG=$(GITCMD) describe --tags GITTAG=$(GITCMD) describe --tags
VERSIONTAG=$(shell $(GITTAG)) ifeq ($(DEVFLAG), true)
VERSIONTAG=dev
else
VERSIONTAG=$(shell $(GITTAG))
endif
SEDCMD=$(shell which sed) SEDCMD=$(shell which sed)
# package # package
@ -209,10 +217,10 @@ build_common: prepare version
$(DOCKERPULL) nginx:1.9 $(DOCKERPULL) nginx:1.9
build_photon: build_common build_photon: build_common
make -f $(MAKEFILEPATH_PHOTON)/Makefile build make -f $(MAKEFILEPATH_PHOTON)/Makefile build -e DEVFLAG=$(DEVFLAG)
build_ubuntu: build_common build_ubuntu: build_common
make -f $(MAKEFILEPATH_UBUNTU)/Makefile build make -f $(MAKEFILEPATH_UBUNTU)/Makefile build -e DEVFLAG=$(DEVFLAG)
build: build_$(BASEIMAGE) build: build_$(BASEIMAGE)
@ -230,8 +238,10 @@ install: compile build modify_composefile
package_online: modify_composefile package_online: modify_composefile
@echo "packing online package ..." @echo "packing online package ..."
@cp -r make $(HARBORPKG) @cp -r make $(HARBORPKG)
@$(SEDCMD) -i 's/image\: vmware/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' $(HARBORPKG)/docker-compose.$(VERSIONTAG).yml @if [ -n "$(REGISTRYSERVER)" ] ; then \
$(SEDCMD) -i 's/image\: vmware/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \
$(HARBORPKG)/docker-compose.$(VERSIONTAG).yml ; \
fi
@cp LICENSE $(HARBORPKG)/LICENSE @cp LICENSE $(HARBORPKG)/LICENSE
@cp NOTICE $(HARBORPKG)/NOTICE @cp NOTICE $(HARBORPKG)/NOTICE
@$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \ @$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \
@ -274,10 +284,10 @@ package_offline: compile build modify_composefile
pushimage: pushimage:
@echo "pushing harbor images ..." @echo "pushing harbor images ..."
@$(DOCKERTAG) $(DOCKERIMAGENAME_UI):$(VERSIONTAG) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG) $(DOCKERTAG) $(DOCKERIMAGENAME_UI):$(VERSIONTAG) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG)
@$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG) \ $(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG) \
$(REGISTRYUSER) $(REGISTRYPASSWORD) $(REGISTRYSERVER) $(REGISTRYUSER) $(REGISTRYPASSWORD) $(REGISTRYSERVER)
@$(DOCKERRMIMAGE) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG) $(DOCKERRMIMAGE) $(REGISTRYSERVER)$(DOCKERIMAGENAME_UI):$(VERSIONTAG)
@$(DOCKERTAG) $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) $(REGISTRYSERVER)$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) @$(DOCKERTAG) $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) $(REGISTRYSERVER)$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG)
@$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \ @$(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \

33
make/photon/Makefile
View File

@ -2,17 +2,18 @@
# #
# Targets: # Targets:
# #
# build: build harbor photon images # build: build harbor ubuntu images
# clean: clean ui and jobservice harbor images # clean: clean ui and jobservice harbor images
# common # common
SHELL := /bin/bash SHELL := /bin/bash
BUILDPATH=$(CURDIR) BUILDPATH=$(CURDIR)
DEPLOYPATH=$(BUILDPATH)/make MAKEPATH=$(BUILDPATH)/make
DEPLOYDEVPATH=$(DEPLOYPATH)/dev MAKEDEVPATH=$(MAKEPATH)/dev
SRCPATH=./src SRCPATH=./src
TOOLSPATH=$(BUILDPATH)/tools TOOLSPATH=$(BUILDPATH)/tools
CHECKENVCMD=checkenv.sh CHECKENVCMD=checkenv.sh
DEVFLAG=true
# docker parameters # docker parameters
DOCKERCMD=$(shell which docker) DOCKERCMD=$(shell which docker)
@ -22,14 +23,14 @@ DOCKERIMASES=$(DOCKERCMD) images
# binary # binary
UISOURCECODE=$(SRCPATH)/ui UISOURCECODE=$(SRCPATH)/ui
UIBINARYPATH=$(DEPLOYDEVPATH)/ui UIBINARYPATH=$(MAKEDEVPATH)/ui
UIBINARYNAME=harbor_ui UIBINARYNAME=harbor_ui
JOBSERVICESOURCECODE=$(SRCPATH)/jobservice JOBSERVICESOURCECODE=$(SRCPATH)/jobservice
JOBSERVICEBINARYPATH=$(DEPLOYDEVPATH)/jobservice JOBSERVICEBINARYPATH=$(MAKEDEVPATH)/jobservice
JOBSERVICEBINARYNAME=harbor_jobservice JOBSERVICEBINARYNAME=harbor_jobservice
# photon dockerfile # ubuntu dockerfile
DOCKERFILEPATH=$(DEPLOYPATH)/photon DOCKERFILEPATH=$(MAKEPATH)/ubuntu
DOCKERFILEPATH_UI=$(DOCKERFILEPATH)/ui DOCKERFILEPATH_UI=$(DOCKERFILEPATH)/ui
DOCKERFILENAME_UI=Dockerfile DOCKERFILENAME_UI=Dockerfile
DOCKERIMAGENAME_UI=vmware/harbor-ui DOCKERIMAGENAME_UI=vmware/harbor-ui
@ -45,26 +46,30 @@ VERSIONFILEPATH=$(SRCPATH)/views/sections
VERSIONFILENAME=header-content.htm VERSIONFILENAME=header-content.htm
GITCMD=$(shell which git) GITCMD=$(shell which git)
GITTAG=$(GITCMD) describe --tags GITTAG=$(GITCMD) describe --tags
VERSIONTAG=$(shell $(GITTAG)) ifeq ($(DEVFLAG), true)
VERSIONTAG=dev
else
VERSIONTAG=$(shell $(GITTAG))
endif
check_environment: check_environment:
@$(TOOLSPATH)/$(CHECKENVCMD) @$(MAKEPATH)/$(CHECKENVCMD)
build: build:
@echo "building ui container for photon..." @echo "building ui container for ubuntu..."
$(DOCKERBUILD) -f $(DOCKERFILEPATH_UI)/$(DOCKERFILENAME_UI) -t $(DOCKERIMAGENAME_UI):$(VERSIONTAG) . $(DOCKERBUILD) -f $(DOCKERFILEPATH_UI)/$(DOCKERFILENAME_UI) -t $(DOCKERIMAGENAME_UI):$(VERSIONTAG) .
@echo "Done." @echo "Done."
@echo "building jobservice container for photon..." @echo "building jobservice container for ubuntu..."
$(DOCKERBUILD) -f $(DOCKERFILEPATH_JOBSERVICE)/$(DOCKERFILENAME_JOBSERVICE) -t $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) . $(DOCKERBUILD) -f $(DOCKERFILEPATH_JOBSERVICE)/$(DOCKERFILENAME_JOBSERVICE) -t $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) .
@echo "Done." @echo "Done."
@echo "building log container for photon..." @echo "building log container for ubuntu..."
$(DOCKERBUILD) -f $(DOCKERFILEPATH_LOG)/$(DOCKERFILENAME_LOG) -t $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) . $(DOCKERBUILD) -f $(DOCKERFILEPATH_LOG)/$(DOCKERFILENAME_LOG) -t $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) .
@echo "Done." @echo "Done."
cleanimage: cleanimage:
@echo "cleaning image for photon..." @echo "cleaning image for ubuntu..."
- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_UI):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_UI):$(VERSIONTAG)
- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG)
- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_LOG):$(VERSIONTAG)

21
make/ubuntu/Makefile
View File

@ -8,11 +8,12 @@
# common # common
SHELL := /bin/bash SHELL := /bin/bash
BUILDPATH=$(CURDIR) BUILDPATH=$(CURDIR)
DEPLOYPATH=$(BUILDPATH)/make MAKEPATH=$(BUILDPATH)/make
DEPLOYDEVPATH=$(DEPLOYPATH)/dev MAKEDEVPATH=$(MAKEPATH)/dev
SRCPATH=./src SRCPATH=./src
TOOLSPATH=$(BUILDPATH)/tools TOOLSPATH=$(BUILDPATH)/tools
CHECKENVCMD=checkenv.sh CHECKENVCMD=checkenv.sh
DEVFLAG=true
# docker parameters # docker parameters
DOCKERCMD=$(shell which docker) DOCKERCMD=$(shell which docker)
@ -22,14 +23,14 @@ DOCKERIMASES=$(DOCKERCMD) images
# binary # binary
UISOURCECODE=$(SRCPATH)/ui UISOURCECODE=$(SRCPATH)/ui
UIBINARYPATH=$(DEPLOYDEVPATH)/ui UIBINARYPATH=$(MAKEDEVPATH)/ui
UIBINARYNAME=harbor_ui UIBINARYNAME=harbor_ui
JOBSERVICESOURCECODE=$(SRCPATH)/jobservice JOBSERVICESOURCECODE=$(SRCPATH)/jobservice
JOBSERVICEBINARYPATH=$(DEPLOYDEVPATH)/jobservice JOBSERVICEBINARYPATH=$(MAKEDEVPATH)/jobservice
JOBSERVICEBINARYNAME=harbor_jobservice JOBSERVICEBINARYNAME=harbor_jobservice
# ubuntu dockerfile # ubuntu dockerfile
DOCKERFILEPATH=$(DEPLOYPATH)/ubuntu DOCKERFILEPATH=$(MAKEPATH)/ubuntu
DOCKERFILEPATH_UI=$(DOCKERFILEPATH)/ui DOCKERFILEPATH_UI=$(DOCKERFILEPATH)/ui
DOCKERFILENAME_UI=Dockerfile DOCKERFILENAME_UI=Dockerfile
DOCKERIMAGENAME_UI=vmware/harbor-ui DOCKERIMAGENAME_UI=vmware/harbor-ui
@ -45,12 +46,16 @@ VERSIONFILEPATH=$(SRCPATH)/views/sections
VERSIONFILENAME=header-content.htm VERSIONFILENAME=header-content.htm
GITCMD=$(shell which git) GITCMD=$(shell which git)
GITTAG=$(GITCMD) describe --tags GITTAG=$(GITCMD) describe --tags
VERSIONTAG=$(shell $(GITTAG)) ifeq ($(DEVFLAG), true)
VERSIONTAG=dev
else
VERSIONTAG=$(shell $(GITTAG))
endif
check_environment: check_environment:
@$(TOOLSPATH)/$(CHECKENVCMD) @$(MAKEPATH)/$(CHECKENVCMD)
build: build:
@echo "building ui container for ubuntu..." @echo "building ui container for ubuntu..."
$(DOCKERBUILD) -f $(DOCKERFILEPATH_UI)/$(DOCKERFILENAME_UI) -t $(DOCKERIMAGENAME_UI):$(VERSIONTAG) . $(DOCKERBUILD) -f $(DOCKERFILEPATH_UI)/$(DOCKERFILENAME_UI) -t $(DOCKERIMAGENAME_UI):$(VERSIONTAG) .
@echo "Done." @echo "Done."