Merge pull request #36 from yipeeio/update-ui-dockerfile

Update ui dockerfile

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8.12.0-alpine
+FROM node:8.14.0-alpine
 WORKDIR /usr/src/app
 # Uncomment kubectl installation if you want api support
 # for "experimental" features

api/api_build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CVT_NAME=api-build-converter
-API_IMG=node:8.12.0-alpine
+API_IMG=node:8.14.0-alpine
 # sleep to make sure converter starts before we try to use it...
 API_CMD="npm install && sleep 5 && npm test"
 

ui/Dockerfile

@@ -1,19 +1,8 @@
-FROM nginx:1.15.5-alpine as builder
-ARG HTML_DEST=/usr/html
-ARG DEFAULT_CFG=default.conf
+FROM node:8.14.0-alpine as builder
 WORKDIR /app
 COPY . /app
-RUN rm -rf /usr/html/index.html && \
-    apk add --update --no-cache chromium \
-                                git \
-                                g++ \
-                                make \
-                                openssh-client \
-                                python \
-                                npm && \
-    npm install npm@latest -g && \
+RUN apk add --update --no-cache chromium && \
     npm install && \
-    npm install @angular/[email protected] --save-dev -g && \
     export CHROME_BIN=/usr/bin/chromium-browser && \
     npm run test-prod
 
@@ -26,6 +15,4 @@ RUN rm -rf /usr/html/index.html
 COPY ./${DEFAULT_CFG} /etc/nginx/conf.d/
 COPY ./run /etc/sysctl.d/
 COPY --from=builder /app/dist ${HTML_DEST}
-    # mkdir -p -m 777 ${HTML_DEST}
-# COPY --from=builder /app/dist ${HTML_DEST}
 EXPOSE 80

ui/package.json

@@ -1,6 +1,9 @@
 {
   "name": "yipee",
   "version": "2.0.229",
+  "peerDependencies": {
+    "@angular/core": "~7.0.2"
+  },
   "license": "MIT",
   "scripts": {
     "ng": "ng",