From 3c44235efec5522cb8ac96e4318ba51029ba1e50 Mon Sep 17 00:00:00 2001 From: wy65701436 Date: Tue, 4 Apr 2017 20:12:00 -0700 Subject: [PATCH 1/2] move clarity to vmware namespace. --- docs/use_make.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/use_make.md b/docs/use_make.md index fbe5dc22e..ec2506540 100644 --- a/docs/use_make.md +++ b/docs/use_make.md @@ -13,7 +13,7 @@ HTTPPROXY | Clarity proxy to build UI. ### Targets Target | Description --------------------|------------- -all | prepare env, compile binaries, build images and install images +all | prepare env, compile binaries, build images and install images prepare | prepare env compile | compile ui and jobservice code compile_ui | compile ui binary @@ -23,15 +23,15 @@ compile_adminserver | compile admin server binary build | build Harbor docker images (default: using build_photon) build_photon | build Harbor docker images from Photon OS base image install | compile binaries, build images, prepare specific version of compose file and startup Harbor instance -start | startup Harbor instance +start | startup Harbor instance down | shutdown Harbor instance package_online | prepare online install package package_offline | prepare offline install package pushimage | push Harbor images to specific registry server clean all | remove binary, Harbor images, specific version docker-compose file, specific version tag and online/offline install package cleanbinary | remove ui and jobservice binary -cleanimage | remove Harbor images -cleandockercomposefile | remove specific version docker-compose +cleanimage | remove Harbor images +cleandockercomposefile | remove specific version docker-compose cleanversiontag | remove specific version tag cleanpackage | remove online/offline install package version | set harbor version @@ -39,13 +39,13 @@ version | set harbor version #### EXAMPLE: #### Build and run harbor from source code. -make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=danieljt/harbor-clarity-base:0.8.4 NOTARYFLAG=true HTTPPROXY= +make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:0.8.4 NOTARYFLAG=true HTTPPROXY= ### Package offline installer -make package_offline GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=danieljt/harbor-clarity-base:0.8.4 NOTARYFLAG=true HTTPPROXY= +make package_offline GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:0.8.4 NOTARYFLAG=true HTTPPROXY= ### Start harbor with notary make -e NOTARYFLAG=true start ### Stop harbor with notary -make -e NOTARYFLAG=true down \ No newline at end of file +make -e NOTARYFLAG=true down From 32555dbb06339671ea4a6e60143ef28d261ecde7 Mon Sep 17 00:00:00 2001 From: wy65701436 Date: Tue, 4 Apr 2017 20:41:22 -0700 Subject: [PATCH 2/2] modify travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d26364069..0c9a3baf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,7 @@ script: - docker-compose -f make/docker-compose.test.yml down - sudo rm -rf /data/config/* - ls /data/cert - - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=danieljt/harbor-clarity-base:0.8.4 NOTARYFLAG=true + - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:0.8.4 NOTARYFLAG=true - docker ps - ./tests/notarytest.sh