diff --git a/.travis.yml b/.travis.yml index 9e9525c74..cdd210c46 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=vmware/harbor-clarity-ui-builder:1.1.0 NOTARYFLAG=true + - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.1 NOTARYFLAG=true - docker ps - ./tests/notarytest.sh diff --git a/Makefile b/Makefile index 629158e7a..86a4a7beb 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ NEWCLARITYVERSION= #clarity parameters CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag] -CLARITYSEEDPATH=/clarity-seed +CLARITYSEEDPATH=/harbor_ui CLARITYBUILDSCRIPT=/entrypoint.sh # docker parameters diff --git a/make/dev/nodeclarity/Dockerfile b/make/dev/nodeclarity/Dockerfile index 7a425d71a..dc6f3fb6d 100644 --- a/make/dev/nodeclarity/Dockerfile +++ b/make/dev/nodeclarity/Dockerfile @@ -1,20 +1,20 @@ FROM node:7.5.0 -RUN mkdir -p /clarity-seed +RUN mkdir -p /harbor_ui -COPY src/ui_ng/package.json /clarity-seed -COPY src/ui_ng/tslint.json /clarity-seed -COPY src/ui_ng/typings.json /clarity-seed -COPY src/ui_ng/yarn.lock /clarity-seed -COPY make/dev/nodeclarity/angular-cli.json /clarity-seed +COPY src/ui_ng/package.json /harbor_ui +COPY src/ui_ng/tslint.json /harbor_ui +COPY src/ui_ng/typings.json /harbor_ui +COPY src/ui_ng/yarn.lock /harbor_ui +COPY make/dev/nodeclarity/angular-cli.json /harbor_ui COPY make/dev/nodeclarity/entrypoint.sh / -COPY src/ui_ng/tsconfig-aot.json /clarity-seed -COPY src/ui_ng/rollup-config.js /clarity-seed +COPY src/ui_ng/tsconfig-aot.json /harbor_ui +COPY src/ui_ng/rollup-config.js /harbor_ui -WORKDIR /clarity-seed +WORKDIR /harbor_ui RUN npm __proxy__ install -g @angular/cli && \ npm __proxy__ install && \ chmod u+x /entrypoint.sh -VOLUME ["/clarity-seed", "/clarity-seed/dist"] +VOLUME ["/harbor_ui", "/harbor_ui/dist"] diff --git a/make/dev/nodeclarity/angular-cli.json b/make/dev/nodeclarity/angular-cli.json index bba385099..059a95272 100644 --- a/make/dev/nodeclarity/angular-cli.json +++ b/make/dev/nodeclarity/angular-cli.json @@ -1,7 +1,7 @@ { "project": { - "version": "1.0.0-beta.20-4", - "name": "clarity-seed" + "version": "1.1.0", + "name": "Harbor" }, "apps": [ { diff --git a/make/dev/nodeclarity/entrypoint.sh b/make/dev/nodeclarity/entrypoint.sh index 8e90cd0f5..5b2a23240 100644 --- a/make/dev/nodeclarity/entrypoint.sh +++ b/make/dev/nodeclarity/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -cd /clarity-seed +cd /harbor_ui rm -rf dist/* npm_proxy=