diff --git a/.gitignore b/.gitignore
index 298e62bb8..c664afff9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,16 @@ src/ui_ng/typings/
**/node_modules
**/ssl/
**/proxy.config.json
+
+src/ui_ng/src/**/*.js
+src/ui_ng/src/**/*.js.map
+src/ui_ng/src/**/*.json
+
**/npm*.log
+
+src/ui_ng/aot/**/*.js
+src/ui_ng/aot/**/*.js.map
+src/ui_ng/aot/**/*.json
+
**/*ngsummary.json
**/*ngfactory.ts
diff --git a/.travis.yml b/.travis.yml
index df904d80a..9e9525c74 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:0.8.4 NOTARYFLAG=true
+ - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.0 NOTARYFLAG=true
- docker ps
- ./tests/notarytest.sh
diff --git a/Makefile b/Makefile
index 6faa7dc65..629158e7a 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,8 @@ NOTARYVERSION=server-0.5.0
NOTARYSIGNERVERSION=signer-0.5.0
MARIADBVERSION=mariadb-10.1.10
HTTPPROXY=
+REBUILDCLARITYFLAG=false
+NEWCLARITYVERSION=
#clarity parameters
CLARITYIMAGE=vmware/harbor-clarity-ui-builder[:tag]
@@ -149,6 +151,7 @@ MAKEFILEPATH_PHOTON=$(MAKEPATH)/photon
DOCKERFILEPATH_COMMON=$(MAKEPATH)/common
DOCKERFILEPATH_DB=$(DOCKERFILEPATH_COMMON)/db
DOCKERFILENAME_DB=Dockerfile
+DOCKERFILE_CLARITY=$(MAKEPATH)/dev/nodeclarity/Dockerfile
# docker image name
DOCKERIMAGENAME_ADMINSERVER=vmware/harbor-adminserver
@@ -156,6 +159,7 @@ DOCKERIMAGENAME_UI=vmware/harbor-ui
DOCKERIMAGENAME_JOBSERVICE=vmware/harbor-jobservice
DOCKERIMAGENAME_LOG=vmware/harbor-log
DOCKERIMAGENAME_DB=vmware/harbor-db
+DOCKERIMAGENAME_CLATIRY=vmware/harbor-clarity-ui-builder
# docker-compose files
DOCKERCOMPOSEFILEPATH=$(MAKEPATH)
@@ -354,6 +358,24 @@ package_offline: compile build modify_sourcefiles modify_composefile
@rm -rf $(HARBORPKG)
@echo "Done."
+
+refresh_clarity_builder:
+ @if [ "$(REBUILDCLIATRYFLAG)" = "true" ] ; then \
+ echo "set http proxy.."; \
+ if [ "$(HTTPPROXY)" != "" ] ; then \
+ $(SEDCMD) -i 's/__proxy__/--proxy $(HTTPPROXY)/g' $(DOCKERFILE_CLARITY) ; \
+ else \
+ $(SEDCMD) -i 's/__proxy__/ /g' $(DOCKERFILE_CLARITY) ; \
+ fi ; \
+ echo "build new clarity image.."; \
+ $(DOCKERBUILD) -f $(DOCKERFILE_CLARITY) -t $(DOCKERIMAGENAME_CLATIRY):$(NEWCLARITYVERSION) . ; \
+ echo "push clarity image.."; \
+ $(DOCKERTAG) $(DOCKERIMAGENAME_CLATIRY):$(NEWCLARITYVERSION) $(DOCKERIMAGENAME_CLATIRY):$(NEWCLARITYVERSION); \
+ $(PUSHSCRIPTPATH)/$(PUSHSCRIPTNAME) $(REGISTRYSERVER)$(DOCKERIMAGENAME_CLATIRY):$(NEWCLARITYVERSION) \
+ $(REGISTRYUSER) $(REGISTRYPASSWORD) $(REGISTRYSERVER); \
+ echo "remove local clarity image.."; \
+ $(DOCKERRMIMAGE) $(REGISTRYSERVER)$(DOCKERIMAGENAME_ADMINSERVER):$(NEWCLARITYVERSION); \
+ fi
pushimage:
@echo "pushing harbor images ..."
diff --git a/make/dev/nodeclarity/Dockerfile b/make/dev/nodeclarity/Dockerfile
index 30a167cdd..7a425d71a 100644
--- a/make/dev/nodeclarity/Dockerfile
+++ b/make/dev/nodeclarity/Dockerfile
@@ -9,10 +9,12 @@ COPY src/ui_ng/yarn.lock /clarity-seed
COPY make/dev/nodeclarity/angular-cli.json /clarity-seed
COPY make/dev/nodeclarity/entrypoint.sh /
+COPY src/ui_ng/tsconfig-aot.json /clarity-seed
+COPY src/ui_ng/rollup-config.js /clarity-seed
+
WORKDIR /clarity-seed
-RUN npm install -g @angular/cli && \
- npm install && \
+RUN npm __proxy__ install -g @angular/cli && \
+ npm __proxy__ install && \
chmod u+x /entrypoint.sh
-
-VOLUME ["/clarity-seed", "/clarity-seed/dist"]
\ No newline at end of file
+VOLUME ["/clarity-seed", "/clarity-seed/dist"]
diff --git a/make/dev/nodeclarity/entrypoint.sh b/make/dev/nodeclarity/entrypoint.sh
index 25bcc6df3..8e90cd0f5 100644
--- a/make/dev/nodeclarity/entrypoint.sh
+++ b/make/dev/nodeclarity/entrypoint.sh
@@ -19,7 +19,17 @@ if [ ! -z "$npm_proxy" -a "$npm_proxy" != " " ]; then
fi
npm install
-ng build
+
+./node_modules/.bin/ngc -p tsconfig-aot.json
+sed -i 's/* as//g' src/app/shared/gauge/gauge.component.js
+./node_modules/.bin/rollup -c rollup-config.js
cp -r ./src/i18n/ dist/
+cp ./src/styles.css dist/
+cp ./node_modules/clarity-icons/clarity-icons.min.css dist/
+cp ./node_modules/mutationobserver-shim/dist/mutationobserver.min.js dist/
+cp ./node_modules/@webcomponents/custom-elements/custom-elements.min.js dist/
+cp ./node_modules/clarity-icons/clarity-icons.min.js dist/
+cp ./node_modules/clarity-ui/clarity-ui.min.css dist/
+cp -r ./node_modules/clarity-icons/shapes/ dist/
diff --git a/src/ui/views/index.html b/src/ui/views/index.html
index 0ecdcbb16..110a9f026 100644
--- a/src/ui/views/index.html
+++ b/src/ui/views/index.html
@@ -15,13 +15,16 @@
Loading...
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+