diff --git a/.travis.yml b/.travis.yml index b842e0ba65..ae7271bcf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,13 +74,13 @@ before_script: - sudo chmod 777 /tmp/registry.db script: - - sudo cp ./src/ui_ng/package.json ./src/ui_ng/src + - sudo cp ./src/ui_ng/package.json ./src/ui_ng/src/ - sudo mkdir -p /etc/ui/ca/ - sudo mv ./tests/ca.crt /etc/ui/ca/ - sudo mkdir -p /harbor - sudo mv ./VERSION /harbor/VERSION - sudo service mysql stop - - sudo make run_clarity_ut CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.2.4 + - sudo make run_clarity_ut CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.2.5 - cat ./src/ui_ng/lib/npm-ut-test-results - sudo ./tests/testprepare.sh - sudo docker-compose -f ./make/docker-compose.test.yml up -d @@ -101,7 +101,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=vmware/harbor-clarity-ui-builder:1.2.4 NOTARYFLAG=true + - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.2.5 NOTARYFLAG=true - docker ps - ./tests/notarytest.sh diff --git a/docs/compile_guide.md b/docs/compile_guide.md index 644fb35ccb..3440893f59 100644 --- a/docs/compile_guide.md +++ b/docs/compile_guide.md @@ -50,13 +50,13 @@ You can compile the code by one of the three approaches: * Build, install and bring up Harbor without Notary: ```sh - $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.2.4 + $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.2.5 ``` * Build, install and bring up Harbor with Notary: ```sh - $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.2.4 NOTARYFLAG=true + $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.2.5 NOTARYFLAG=true ``` #### II. Compile code with your own Golang environment, then build Harbor diff --git a/make/dev/nodeclarity/entrypoint.sh b/make/dev/nodeclarity/entrypoint.sh index 3ab9c80ad5..5e574f4086 100644 --- a/make/dev/nodeclarity/entrypoint.sh +++ b/make/dev/nodeclarity/entrypoint.sh @@ -18,7 +18,8 @@ if [ ! -z "$npm_proxy" -a "$npm_proxy" != " " ]; then npm config set proxy $npm_proxy fi -cp ./src/package.json . +mv ./src/package.json ./ +cat ./package.json npm install ./node_modules/.bin/ngc -p tsconfig-aot.json diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index 72ab7d858e..5021044ae1 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -31,7 +31,7 @@ "clarity-icons": "^0.9.8", "clarity-ui": "^0.9.8", "core-js": "^2.4.1", - "harbor-ui": "^0.2.19", + "harbor-ui": "^0.2.20", "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0",