From ba49eb79f12e200d54f69d3387f5ddf0fbfdcc6f Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Fri, 21 Apr 2017 19:34:57 +0800
Subject: [PATCH] Update for ui image building.

---
 make/dev/nodeclarity/Dockerfile    |  6 ++++--
 make/dev/nodeclarity/entrypoint.sh |  1 +
 src/ui/views/index.html            | 19 +++++++++++--------
 src/ui_ng/rollup-config.js         |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/make/dev/nodeclarity/Dockerfile b/make/dev/nodeclarity/Dockerfile
index b98d48f17..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 __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 472dab360..8e90cd0f5 100644
--- a/make/dev/nodeclarity/entrypoint.sh
+++ b/make/dev/nodeclarity/entrypoint.sh
@@ -25,6 +25,7 @@ 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/
diff --git a/src/ui/views/index.html b/src/ui/views/index.html
index 0ecdcbb16..71bc6f8d2 100644
--- a/src/ui/views/index.html
+++ b/src/ui/views/index.html
@@ -15,13 +15,16 @@
             Loading...
         </div>
     </harbor-app>
-    <script type="text/javascript" src="/static/inline.bundle.js"></script>
-    <script type="text/javascript" src="/static/scripts.bundle.js">
-    </script>
-    <script type="text/javascript" src="/static/styles.bundle.js">
-    </script>
-    <script type="text/javascript" src="/static/vendor.bundle.js"></script>
-    <script type="text/javascript" src="/static/main.bundle.js"></script>
+
+<link rel="stylesheet" href="/static/clarity-ui.min.css">
+<link rel="stylesheet" href="/static/clarity-icons.min.css">
+<link rel="stylesheet" href="/static/styles.css">
+
+<script src="/static/mutationobserver.min.js"></script>
+<script src="/static/custom-elements.min.js"></script>
+<script src="/static/clarity-icons.min.js"></script>
+
+<script src="/static/build.js"></script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/ui_ng/rollup-config.js b/src/ui_ng/rollup-config.js
index 11f270504..4d92bd67a 100644
--- a/src/ui_ng/rollup-config.js
+++ b/src/ui_ng/rollup-config.js
@@ -4,7 +4,7 @@ import uglify      from 'rollup-plugin-uglify';
 
 export default {
   entry: 'src/main-aot.js',
-  dest: 'src/build.js', // output a single application bundle
+  dest: 'dist/build.js', // output a single application bundle
   sourceMap: false,
   format: 'iife',
   onwarn: function(warning) {