diff --git a/.gitignore b/.gitignore
index d7da3b8cb..d79e11032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,5 +52,3 @@ src/ui_ng/aot/**/*.json
**/aot
**/dist
**/.bin
-package-lock.json
-src/ui_ng/package-lock.json
diff --git a/.travis.yml b/.travis.yml
index 55a4c8659..a7610f288 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,7 +79,7 @@ script:
- sudo mkdir -p /harbor
- sudo mv ./VERSION /harbor/UIVERSION
- sudo service postgresql stop
- - sudo make run_clarity_ut CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.4.0
+ - sudo make run_clarity_ut CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.6.0
- cat ./src/ui_ng/npm-ut-test-results
- sudo ./tests/testprepare.sh
- sudo make -f make/photon/Makefile _build_db _build_registry -e VERSIONTAG=dev -e CLAIRDBVERSION=dev -e REGISTRYVERSION=v2.6.2
@@ -105,7 +105,7 @@ script:
- sudo rm -rf /data/config/*
- sudo rm -rf /data/database/*
- ls /data/cert
- - sudo make install GOBUILDIMAGE=golang:1.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.4.0 NOTARYFLAG=true CLAIRFLAG=true
+ - sudo make install GOBUILDIMAGE=golang:1.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.6.0 NOTARYFLAG=true CLAIRFLAG=true
- sleep 10
- docker ps
- ./tests/validatecontainers.sh
diff --git a/docs/compile_guide.md b/docs/compile_guide.md
index a2d0560c4..77198909c 100644
--- a/docs/compile_guide.md
+++ b/docs/compile_guide.md
@@ -50,19 +50,19 @@ 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.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.4.0
+ $ make install GOBUILDIMAGE=golang:1.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.6.0
```
* Build, install and bring up Harbor with Notary:
```sh
- $ make install GOBUILDIMAGE=golang:1.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.4.0 NOTARYFLAG=true
+ $ make install GOBUILDIMAGE=golang:1.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.6.0 NOTARYFLAG=true
```
* Build, install and bring up Harbor with Clair:
```sh
- $ make install GOBUILDIMAGE=golang:1.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.4.0 CLAIRFLAG=true
+ $ make install GOBUILDIMAGE=golang:1.9.2 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.6.0 CLAIRFLAG=true
```
#### II. Compile code with your own Golang environment, then build Harbor
diff --git a/make/dev/nodeclarity/Dockerfile b/make/dev/nodeclarity/Dockerfile
index e80eb52f8..3c9db071b 100644
--- a/make/dev/nodeclarity/Dockerfile
+++ b/make/dev/nodeclarity/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:7.5.0
+FROM node:10.7.0
RUN mkdir -p /harbor_resources
RUN mkdir -p /harbor_src
@@ -7,14 +7,26 @@ COPY src/ui_ng/package.json /harbor_resources
COPY make/dev/nodeclarity/entrypoint.sh /
# Install Chrome
-RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
-RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" | tee /etc/apt/sources.list.d/google-chrome.list
-RUN apt-get update && apt-get -y install google-chrome-stable
+RUN apt-get update && apt-get install -y \
+ apt-transport-https \
+ ca-certificates \
+ curl \
+ gnupg \
+ hicolor-icon-theme \
+ libcanberra-gtk* \
+ libgl1-mesa-dri \
+ libgl1-mesa-glx \
+ libpango1.0-0 \
+ libpulse0 \
+ libv4l-0 \
+ --no-install-recommends
+RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+RUN dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install
+RUN rm google-chrome-stable_current_amd64.deb
# Install npm package
WORKDIR /harbor_resources
-RUN npm __proxy__ install -g @angular/cli && \
- npm __proxy__ install && \
+RUN npm __proxy__ install && \
chmod u+x /entrypoint.sh
VOLUME ["/harbor_src"]
diff --git a/make/dev/nodeclarity/angular-cli.json b/make/dev/nodeclarity/angular-cli.json
index 48f8da43b..a69da931f 100644
--- a/make/dev/nodeclarity/angular-cli.json
+++ b/make/dev/nodeclarity/angular-cli.json
@@ -1,6 +1,6 @@
{
"project": {
- "version": "1.2.0",
+ "version": "1.6.0",
"name": "Harbor"
},
"apps": [{
@@ -19,6 +19,7 @@
"styles": [
"../node_modules/clarity-icons/clarity-icons.min.css",
"../node_modules/clarity-ui/clarity-ui.min.css",
+ "../node_modules/prismjs/themes/prism-solarizedlight.css",
"styles.css"
],
"scripts": [
@@ -26,7 +27,10 @@
"../node_modules/mutationobserver-shim/dist/mutationobserver.min.js",
"../node_modules/@webcomponents/custom-elements/custom-elements.min.js",
"../node_modules/clarity-icons/clarity-icons.min.js",
- "../node_modules/web-animations-js/web-animations.min.js"
+ "../node_modules/web-animations-js/web-animations.min.js",
+ "../node_modules/marked/lib/marked.js",
+ "../node_modules/prismjs/prism.js",
+ "../node_modules/prismjs/components/prism-yaml.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
diff --git a/make/dev/nodeclarity/entrypoint.sh b/make/dev/nodeclarity/entrypoint.sh
index bec32011d..d3eae1ec9 100644
--- a/make/dev/nodeclarity/entrypoint.sh
+++ b/make/dev/nodeclarity/entrypoint.sh
@@ -26,6 +26,15 @@ fi
cat ./package.json
npm install
+## Build harbor-ui and link it
+rm -rf /harbor_src/ui_ng/lib/dist
+npm run build:lib
+chmod -R +xr /harbor_src/ui_ng/lib/dist
+cd /harbor_src/ui_ng/lib/dist
+npm link
+cd /harbor_src/ui_ng
+npm link harbor-ui
+
./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
@@ -44,3 +53,8 @@ cp ./node_modules/@webcomponents/custom-elements/custom-elements.min.js ../ui/st
cp ./node_modules/clarity-icons/clarity-icons.min.js ../ui/static/
cp ./node_modules/clarity-ui/clarity-ui.min.css ../ui/static/
cp -r ./node_modules/clarity-icons/shapes/ ../ui/static/
+
+cp ./node_modules/prismjs/themes/prism-solarizedlight.css ../ui/static/
+cp ./node_modules/marked/lib/marked.js ../ui/static/
+cp ./node_modules/prismjs/prism.js ../ui/static/
+cp ./node_modules/prismjs/components/prism-yaml.min.js ../ui/static/
\ No newline at end of file
diff --git a/src/ui/views/index.html b/src/ui/views/index.html
index 9564aba87..a1d463127 100644
--- a/src/ui/views/index.html
+++ b/src/ui/views/index.html
@@ -15,13 +15,18 @@
Loading...
+
+
+
+
+