From 9775de3d78472719154b8ca1133a5db9fa1e1b41 Mon Sep 17 00:00:00 2001 From: Penghao Cen Date: Mon, 24 Oct 2016 14:30:31 +0800 Subject: [PATCH 1/9] Add prettyjws in pattern for signed manifest support --- src/ui/service/notification.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/service/notification.go b/src/ui/service/notification.go index 33ef0ba7a..a47ea60fa 100644 --- a/src/ui/service/notification.go +++ b/src/ui/service/notification.go @@ -35,7 +35,7 @@ type NotificationHandler struct { beego.Controller } -const manifestPattern = `^application/vnd.docker.distribution.manifest.v\d\+json` +const manifestPattern = `^application/vnd.docker.distribution.manifest.v\d\+(json|prettyjws)` // Post handles POST request, and records audit log or refreshes cache based on event. func (n *NotificationHandler) Post() { From 45803b53e15023997e70a8c672d7c72858da1d45 Mon Sep 17 00:00:00 2001 From: kunw Date: Tue, 25 Oct 2016 16:20:42 +0800 Subject: [PATCH 2/9] Updates for blocking account settings in LDAP auth mode. --- src/ui/controllers/accountsetting.go | 7 +++++++ src/ui/controllers/changepassword.go | 7 +++++++ src/ui/controllers/optionalmenu.go | 6 ++++++ src/ui/controllers/signup.go | 2 +- src/ui/views/optional-menu.htm | 2 ++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/ui/controllers/accountsetting.go b/src/ui/controllers/accountsetting.go index 5d49e60d7..516547b98 100644 --- a/src/ui/controllers/accountsetting.go +++ b/src/ui/controllers/accountsetting.go @@ -1,5 +1,9 @@ package controllers +import ( + "net/http" +) + // AccountSettingController handles request to /account_setting type AccountSettingController struct { BaseController @@ -7,5 +11,8 @@ type AccountSettingController struct { // Get renders the account settings page func (asc *AccountSettingController) Get() { + if asc.AuthMode != "db_auth" { + asc.CustomAbort(http.StatusForbidden, "") + } asc.Forward("page_title_account_setting", "account-settings.htm") } diff --git a/src/ui/controllers/changepassword.go b/src/ui/controllers/changepassword.go index 0ecddb29c..842cbe2f2 100644 --- a/src/ui/controllers/changepassword.go +++ b/src/ui/controllers/changepassword.go @@ -1,5 +1,9 @@ package controllers +import ( + "net/http" +) + // ChangePasswordController handles request to /change_password type ChangePasswordController struct { BaseController @@ -7,5 +11,8 @@ type ChangePasswordController struct { // Get renders the change password page func (asc *ChangePasswordController) Get() { + if asc.AuthMode != "db_auth" { + asc.CustomAbort(http.StatusForbidden, "") + } asc.Forward("page_title_change_password", "change-password.htm") } diff --git a/src/ui/controllers/optionalmenu.go b/src/ui/controllers/optionalmenu.go index 80524d55f..96efcac68 100644 --- a/src/ui/controllers/optionalmenu.go +++ b/src/ui/controllers/optionalmenu.go @@ -19,6 +19,7 @@ func (omc *OptionalMenuController) Get() { var hasLoggedIn bool var allowAddNew bool + var allowSettingAccount bool if sessionUserID != nil { hasLoggedIn = true @@ -34,6 +35,10 @@ func (omc *OptionalMenuController) Get() { } omc.Data["Username"] = u.Username + if omc.AuthMode == "db_auth" { + allowSettingAccount = true + } + isAdmin, err := dao.IsAdminRole(sessionUserID.(int)) if err != nil { log.Errorf("Error occurred in IsAdminRole: %v", err) @@ -45,6 +50,7 @@ func (omc *OptionalMenuController) Get() { } } omc.Data["AddNew"] = allowAddNew + omc.Data["SettingAccount"] = allowSettingAccount omc.Data["HasLoggedIn"] = hasLoggedIn omc.TplName = "optional-menu.htm" omc.Render() diff --git a/src/ui/controllers/signup.go b/src/ui/controllers/signup.go index 6ed75b01b..d3b7bdc90 100644 --- a/src/ui/controllers/signup.go +++ b/src/ui/controllers/signup.go @@ -12,7 +12,7 @@ type SignUpController struct { // Get renders sign up page func (suc *SignUpController) Get() { if suc.AuthMode != "db_auth" || !suc.SelfRegistration { - suc.CustomAbort(http.StatusUnauthorized, "Status unauthorized.") + suc.CustomAbort(http.StatusForbidden, "") } suc.Data["AddNew"] = false suc.Forward("page_title_sign_up", "sign-up.htm") diff --git a/src/ui/views/optional-menu.htm b/src/ui/views/optional-menu.htm index b32ec201f..56d78b9a1 100644 --- a/src/ui/views/optional-menu.htm +++ b/src/ui/views/optional-menu.htm @@ -21,7 +21,9 @@ {{ if eq .AddNew true }}
  •   // 'add_new_title' | tr //
    • {{ end }} + {{ if eq .SettingAccount true }}
  •   // 'account_setting' | tr //
    • + {{ end }}
  •   //vm.languageName//
      From bb0246910e31165b7d3ef7de43f4cbf54cf58ea7 Mon Sep 17 00:00:00 2001 From: kunw Date: Tue, 25 Oct 2016 18:22:29 +0800 Subject: [PATCH 3/9] Updates for hiding buttons against to user role. --- .../components/details/retrieve-projects.directive.js | 7 ++++++- .../project-member/edit-project-member.directive.html | 2 +- .../project-member/edit-project-member.directive.js | 3 ++- .../project-member/list-project-member.directive.html | 10 +++++----- .../project-member/list-project-member.directive.js | 9 +++------ .../components/project/publicity-button.directive.html | 4 ++-- .../components/project/publicity-button.directive.js | 3 ++- .../repository/list-repository.directive.html | 4 ++-- .../components/repository/list-repository.directive.js | 5 +++-- .../js/components/repository/list-tag.directive.html | 4 ++-- .../js/components/repository/list-tag.directive.js | 3 ++- src/ui/views/project.htm | 6 +++--- src/ui/views/repository.htm | 6 +++--- 13 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/ui/static/resources/js/components/details/retrieve-projects.directive.js b/src/ui/static/resources/js/components/details/retrieve-projects.directive.js index 3d5641b11..3533f2c42 100644 --- a/src/ui/static/resources/js/components/details/retrieve-projects.directive.js +++ b/src/ui/static/resources/js/components/details/retrieve-projects.directive.js @@ -29,6 +29,7 @@ vm.isOpen = false; vm.isProjectMember = false; vm.target = $location.path().substr(1) || 'repositories'; + vm.roleId = 0; vm.isPublic = Number(getParameterByName('is_public', $location.absUrl())); @@ -152,6 +153,9 @@ function getCurrentProjectMemberSuccess(data, status) { console.log('Successful get current project member:' + status); vm.isProjectMember = true; + if(data && data['roles'] && data['roles'].length > 0) { + vm.roleId = data['roles'][0]['role_id']; + } } function getCurrentProjectMemberFailed(data, status) { @@ -171,7 +175,8 @@ 'isOpen': '=', 'selectedProject': '=', 'isPublic': '=', - 'isProjectMember': '=' + 'isProjectMember': '=', + 'roleId': '=' }, link: link, controller: RetrieveProjectsController, diff --git a/src/ui/static/resources/js/components/project-member/edit-project-member.directive.html b/src/ui/static/resources/js/components/project-member/edit-project-member.directive.html index 4f83d1a13..1d1b48f47 100644 --- a/src/ui/static/resources/js/components/project-member/edit-project-member.directive.html +++ b/src/ui/static/resources/js/components/project-member/edit-project-member.directive.html @@ -14,7 +14,7 @@ --> //vm.username// - + diff --git a/src/ui/static/resources/js/components/project-member/edit-project-member.directive.js b/src/ui/static/resources/js/components/project-member/edit-project-member.directive.js index f1e73b48e..b2f7d9c49 100644 --- a/src/ui/static/resources/js/components/project-member/edit-project-member.directive.js +++ b/src/ui/static/resources/js/components/project-member/edit-project-member.directive.js @@ -87,7 +87,8 @@ 'roleName': '=', 'projectId': '=', 'delete': '&', - 'reload': '&' + 'reload': '&', + 'currentRoleId': '@' }, 'controller': EditProjectMemberController, 'controllerAs': 'vm', diff --git a/src/ui/static/resources/js/components/project-member/list-project-member.directive.html b/src/ui/static/resources/js/components/project-member/list-project-member.directive.html index befef1d01..31a5af950 100644 --- a/src/ui/static/resources/js/components/project-member/list-project-member.directive.html +++ b/src/ui/static/resources/js/components/project-member/list-project-member.directive.html @@ -21,23 +21,23 @@ - - + + - +
      - +
      // 'username' | tr //// 'role' | tr //// 'operation' | tr //// 'username' | tr //// 'role' | tr //// 'operation' | tr //
      - +
      diff --git a/src/ui/static/resources/js/components/project-member/list-project-member.directive.js b/src/ui/static/resources/js/components/project-member/list-project-member.directive.js index 992b1d598..6fa330532 100644 --- a/src/ui/static/resources/js/components/project-member/list-project-member.directive.js +++ b/src/ui/static/resources/js/components/project-member/list-project-member.directive.js @@ -56,11 +56,7 @@ } function addProjectMember() { - if(vm.isOpen) { - vm.isOpen = false; - }else{ - vm.isOpen = true; - } + vm.isOpen = !vm.isOpen; } function deleteProjectMember(e) { @@ -105,7 +101,8 @@ 'restrict': 'E', 'templateUrl': '/static/resources/js/components/project-member/list-project-member.directive.html', 'scope': { - 'sectionHeight': '=' + 'sectionHeight': '=', + 'roleId': '@' }, 'link': link, 'controller': ListProjectMemberController, diff --git a/src/ui/static/resources/js/components/project/publicity-button.directive.html b/src/ui/static/resources/js/components/project/publicity-button.directive.html index 05a4688b0..68a66cca2 100644 --- a/src/ui/static/resources/js/components/project/publicity-button.directive.html +++ b/src/ui/static/resources/js/components/project/publicity-button.directive.html @@ -12,5 +12,5 @@ See the License for the specific language governing permissions and limitations under the License. --> - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/ui/static/resources/js/components/project/publicity-button.directive.js b/src/ui/static/resources/js/components/project/publicity-button.directive.js index 7f108b880..1af415ecc 100644 --- a/src/ui/static/resources/js/components/project/publicity-button.directive.js +++ b/src/ui/static/resources/js/components/project/publicity-button.directive.js @@ -60,7 +60,8 @@ 'templateUrl': '/static/resources/js/components/project/publicity-button.directive.html', 'scope': { 'isPublic': '=', - 'projectId': '=' + 'projectId': '=', + 'roleId': '@' }, 'link': link, 'controller': PublicityButtonController, diff --git a/src/ui/static/resources/js/components/repository/list-repository.directive.html b/src/ui/static/resources/js/components/repository/list-repository.directive.html index 42b02744c..c8f666306 100644 --- a/src/ui/static/resources/js/components/repository/list-repository.directive.html +++ b/src/ui/static/resources/js/components/repository/list-repository.directive.html @@ -23,10 +23,10 @@  //repo//   //vm.tagCount[repo]// - +
      - +
      diff --git a/src/ui/static/resources/js/components/repository/list-repository.directive.js b/src/ui/static/resources/js/components/repository/list-repository.directive.js index 655ac6764..b26228763 100644 --- a/src/ui/static/resources/js/components/repository/list-repository.directive.js +++ b/src/ui/static/resources/js/components/repository/list-repository.directive.js @@ -26,7 +26,7 @@ $scope.subsTabPane = 30; var vm = this; - + vm.sectionHeight = {'min-height': '579px'}; vm.filterInput = ''; @@ -180,7 +180,8 @@ 'restrict': 'E', 'templateUrl': '/static/resources/js/components/repository/list-repository.directive.html', 'scope': { - 'sectionHeight': '=' + 'sectionHeight': '=', + 'roleId': '@' }, 'link': link, 'controller': ListRepositoryController, diff --git a/src/ui/static/resources/js/components/repository/list-tag.directive.html b/src/ui/static/resources/js/components/repository/list-tag.directive.html index 94fc5dab0..029b02a2d 100644 --- a/src/ui/static/resources/js/components/repository/list-tag.directive.html +++ b/src/ui/static/resources/js/components/repository/list-tag.directive.html @@ -5,7 +5,7 @@ // 'tag' | tr // // 'image_details' | tr // // 'pull_command' | tr // - // 'operation' | tr // + // 'operation' | tr // @@ -14,7 +14,7 @@ - + diff --git a/src/ui/static/resources/js/components/repository/list-tag.directive.js b/src/ui/static/resources/js/components/repository/list-tag.directive.js index f47b0b917..279446500 100644 --- a/src/ui/static/resources/js/components/repository/list-tag.directive.js +++ b/src/ui/static/resources/js/components/repository/list-tag.directive.js @@ -85,7 +85,8 @@ 'associateId': '=', 'repoName': '=', 'toggleInProgress': '=', - 'deleteByTag': '&' + 'deleteByTag': '&', + 'roleId': '@' }, 'replace': true, 'controller': ListTagController, diff --git a/src/ui/views/project.htm b/src/ui/views/project.htm index 7d7d32480..e1b884a82 100644 --- a/src/ui/views/project.htm +++ b/src/ui/views/project.htm @@ -48,7 +48,7 @@ // 'role' | tr // // 'creation_time' | tr // // 'publicity' | tr // - // 'operation' | tr // + // 'operation' | tr // @@ -63,8 +63,8 @@ //p.repo_count// //vm.getProjectRole(p.current_user_role_id) | tr// //p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'// - - + +    diff --git a/src/ui/views/repository.htm b/src/ui/views/repository.htm index 0ee168ccc..7a9f94d45 100644 --- a/src/ui/views/repository.htm +++ b/src/ui/views/repository.htm @@ -30,13 +30,13 @@ - +
      - + - +
      From 0e870bf694867ea391630f9c1d846815a7f65141 Mon Sep 17 00:00:00 2001 From: kunw Date: Tue, 25 Oct 2016 18:39:55 +0800 Subject: [PATCH 4/9] Updates for refreshing repo or tags when deleted. --- .../js/components/repository/list-repository.directive.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ui/static/resources/js/components/repository/list-repository.directive.js b/src/ui/static/resources/js/components/repository/list-repository.directive.js index 655ac6764..3b7695c63 100644 --- a/src/ui/static/resources/js/components/repository/list-repository.directive.js +++ b/src/ui/static/resources/js/components/repository/list-repository.directive.js @@ -155,6 +155,7 @@ function deleteRepositorySuccess(data, status) { vm.toggleInProgress[vm.repoName + '|' + vm.tag] = false; vm.retrieve(); + $scope.$broadcast('refreshTags', true); } function deleteRepositoryFailed(data, status) { From 07b09a92b815f48540f6eada7e342d8957250cb9 Mon Sep 17 00:00:00 2001 From: kunw Date: Wed, 26 Oct 2016 12:40:10 +0800 Subject: [PATCH 5/9] Updates for checking role id. --- .../js/components/project/publicity-button.directive.html | 4 ++-- src/ui/views/project.htm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/static/resources/js/components/project/publicity-button.directive.html b/src/ui/static/resources/js/components/project/publicity-button.directive.html index 68a66cca2..7c9038831 100644 --- a/src/ui/static/resources/js/components/project/publicity-button.directive.html +++ b/src/ui/static/resources/js/components/project/publicity-button.directive.html @@ -12,5 +12,5 @@ See the License for the specific language governing permissions and limitations under the License. --> - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/ui/views/project.htm b/src/ui/views/project.htm index e1b884a82..4c0360068 100644 --- a/src/ui/views/project.htm +++ b/src/ui/views/project.htm @@ -48,7 +48,7 @@ // 'role' | tr // // 'creation_time' | tr // // 'publicity' | tr // - // 'operation' | tr // + // 'operation' | tr // @@ -64,8 +64,8 @@ //vm.getProjectRole(p.current_user_role_id) | tr// //p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'// - -    + +    From 03e2a3ee566e1c0832bac86ad9947c840ec7d8ef Mon Sep 17 00:00:00 2001 From: yhua Date: Wed, 26 Oct 2016 13:04:52 +0800 Subject: [PATCH 6/9] remove tag in docker-compose.yml --- .travis.yml | 2 +- Makefile | 15 ++++++++------- make/{docker-compose.yml => docker-compose.tpl} | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) rename make/{docker-compose.yml => docker-compose.tpl} (98%) diff --git a/.travis.yml b/.travis.yml index 6db7ed3f7..8357bfd80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,7 @@ script: - 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 - go run tests/startuptest.go http://localhost/ diff --git a/Makefile b/Makefile index 52b5ffefa..b15b8b76b 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ # # package_online: # prepare online install package -# for example: make package_online -e \ +# for example: make package_online -e DEVFLAG=flase\ # REGISTRYSERVER=reg-bj.eng.vmware.com \ # REGISTRYPROJECTNAME=harborrelease # @@ -33,13 +33,13 @@ # prepare offline install package # # 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=***** \ # REGISTRYSERVER=reg-bj.eng.vmware.com/ \ # REGISTRYPROJECTNAME=harborrelease # note**: need add "/" on end of REGISTRYSERVER. If not setting \ # this value will push images directly to dockerhub. -# make pushimage -e REGISTRYUSER=vmware \ +# make pushimage -e DEVFLAG=flase REGISTRYUSER=vmware \ # REGISTRYPASSWORD=***** \ # REGISTRYPROJECTNAME=vmware # @@ -141,6 +141,7 @@ DOCKERIMAGENAME_DB=vmware/harbor-db # docker-compose files DOCKERCOMPOSEFILEPATH=$(MAKEPATH) +DOCKERCOMPOSETPLFILENAME=docker-compose.tpl DOCKERCOMPOSEFILENAME=docker-compose.yml # version prepare @@ -229,8 +230,8 @@ build: build_$(BASEIMAGE) modify_composefile: @echo "preparing tag:$(VERSIONTAG) docker-compose file..." - @cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml - @$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml + @cp $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSETPLFILENAME) $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) + @$(SEDCMD) -i 's/image\: vmware.*/&:$(VERSIONTAG)/g' $(DOCKERCOMPOSEFILEPATH)/$(DOCKERCOMPOSEFILENAME) install: compile build modify_composefile @echo "loading harbor images..." @@ -249,7 +250,7 @@ package_online: modify_composefile @$(TARCMD) -zcvf harbor-online-installer-$(VERSIONTAG).tgz \ --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \ --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \ - --exclude=$(HARBORPKG)/dev --exclude=docker-compose.yml \ + --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \ --exclude=$(HARBORPKG)/checkenv.sh \ --exclude=$(HARBORPKG)/jsminify.sh \ --exclude=$(HARBORPKG)/pushimage.sh \ @@ -275,7 +276,7 @@ package_offline: compile build modify_composefile @$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \ --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \ --exclude=$(HARBORPKG)/photon --exclude=$(HARBORPKG)/kubernetes \ - --exclude=$(HARBORPKG)/dev --exclude=docker-compose.yml \ + --exclude=$(HARBORPKG)/dev --exclude=$(DOCKERCOMPOSETPLFILENAME) \ --exclude=$(HARBORPKG)/checkenv.sh \ --exclude=$(HARBORPKG)/jsminify.sh \ --exclude=$(HARBORPKG)/pushimage.sh \ diff --git a/make/docker-compose.yml b/make/docker-compose.tpl similarity index 98% rename from make/docker-compose.yml rename to make/docker-compose.tpl index 1e7e81f71..4c5258198 100644 --- a/make/docker-compose.yml +++ b/make/docker-compose.tpl @@ -74,7 +74,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "jobservice" proxy: - image: nginx:1.9.0 + image: nginx:1.9 container_name: nginx restart: always volumes: From 269b6b887a24a15025d03362886e74f48637dfb0 Mon Sep 17 00:00:00 2001 From: yhua Date: Wed, 26 Oct 2016 13:30:02 +0800 Subject: [PATCH 7/9] update registry image version in test docker-compose file --- tests/docker-compose.test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml index e37f16bc8..8f233bd9b 100644 --- a/tests/docker-compose.test.yml +++ b/tests/docker-compose.test.yml @@ -1,7 +1,7 @@ version: '2' services: registry: - image: library/registry:2.4.0 + image: library/registry:2.5.0 restart: always volumes: - /data/registry:/storage From a6e7a6ba4580f0ba45bd0364f09abe841a881086 Mon Sep 17 00:00:00 2001 From: yhua Date: Wed, 26 Oct 2016 13:46:22 +0800 Subject: [PATCH 8/9] fix baseimage issue --- make/photon/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/make/photon/Makefile b/make/photon/Makefile index 81fac2acd..0a1aeaaad 100644 --- a/make/photon/Makefile +++ b/make/photon/Makefile @@ -2,7 +2,7 @@ # # Targets: # -# build: build harbor ubuntu images +# build: build harbor photon images # clean: clean ui and jobservice harbor images # common @@ -29,8 +29,8 @@ JOBSERVICESOURCECODE=$(SRCPATH)/jobservice JOBSERVICEBINARYPATH=$(MAKEDEVPATH)/jobservice JOBSERVICEBINARYNAME=harbor_jobservice -# ubuntu dockerfile -DOCKERFILEPATH=$(MAKEPATH)/ubuntu +# photon dockerfile +DOCKERFILEPATH=$(MAKEPATH)/photon DOCKERFILEPATH_UI=$(DOCKERFILEPATH)/ui DOCKERFILENAME_UI=Dockerfile DOCKERIMAGENAME_UI=vmware/harbor-ui @@ -55,21 +55,21 @@ endif check_environment: @$(MAKEPATH)/$(CHECKENVCMD) -build: - @echo "building ui container for ubuntu..." +build: + @echo "building ui container for photon..." $(DOCKERBUILD) -f $(DOCKERFILEPATH_UI)/$(DOCKERFILENAME_UI) -t $(DOCKERIMAGENAME_UI):$(VERSIONTAG) . @echo "Done." - @echo "building jobservice container for ubuntu..." + @echo "building jobservice container for photon..." $(DOCKERBUILD) -f $(DOCKERFILEPATH_JOBSERVICE)/$(DOCKERFILENAME_JOBSERVICE) -t $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) . @echo "Done." - @echo "building log container for ubuntu..." + @echo "building log container for photon..." $(DOCKERBUILD) -f $(DOCKERFILEPATH_LOG)/$(DOCKERFILENAME_LOG) -t $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) . @echo "Done." cleanimage: - @echo "cleaning image for ubuntu..." + @echo "cleaning image for photon..." - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_UI):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) - $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_LOG):$(VERSIONTAG) From 714543238defa1782941ab3d1f10dc0b58fce9cf Mon Sep 17 00:00:00 2001 From: supereagle Date: Wed, 26 Oct 2016 14:34:38 +0800 Subject: [PATCH 9/9] remove useless doc --- docs/image_pulling_chinese_user.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 docs/image_pulling_chinese_user.md diff --git a/docs/image_pulling_chinese_user.md b/docs/image_pulling_chinese_user.md deleted file mode 100644 index 37a78562c..000000000 --- a/docs/image_pulling_chinese_user.md +++ /dev/null @@ -1,11 +0,0 @@ -### A faster way to pull images for Chinese Harbor users -By default, Harbor not only build images according to Dockerfile but also pull images from Docker Hub. For the reason we all know, it is difficult for Chinese Harbor users to pull images from the Docker Hub. We put images on daocloud.io platform, we'll put images on other platforms later. If you have difficulty to pull images from Docker Hub, or you think it wastes too much time to build images. We recommend you to use the following way to accelerate the pulling procedure(make sure you're in the harbor diectory): -``` -$ cd contrib -$ cp docker-compose.yml.daocloud ../make -$ cd ../make -$ mv docker-compose.yml docker-compose.yml.bak -$ mv docker-compose.yml.daocloud docker-compose.yml -$ docker-compose up -d -``` -Then you'll see docker pulling imges faster than before.