Merge pull request #43 from cmu-sei/9.25.2020

Update for 9.25.2020

alloy.ui/.gitignore

@@ -48,3 +48,5 @@ Thumbs.db
 /terraform/
 
 src/assets/config/settings.env.json
+docker/
+.vscode/

alloy.ui/angular.json

@@ -19,14 +19,10 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.css"
-            ],
-            "scripts": []
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": ["src/styles/styles.scss"],
+            "scripts": [],
+            "preserveSymlinks": true
           },
           "configurations": {
             "production": {
@@ -84,26 +80,16 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
-            "styles": [
-              "src/styles.css"
-            ],
+            "styles": ["src/styles.css"],
             "scripts": [],
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ]
+            "assets": ["src/favicon.ico", "src/assets"]
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
@@ -129,13 +115,16 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "exclude": ["**/node_modules/**"]
           }
         }
       }
     }
   },
-  "defaultProject": "alloy"
-}
+  "defaultProject": "alloy",
+  "schematics": {
+    "@schematics/angular:component": {
+      "styleext": "scss"
+    }
+  }
+}

alloy.ui/default.conf

@@ -0,0 +1,27 @@
+server {
+
+  listen 80;
+
+  sendfile on;
+
+  default_type application/octet-stream;
+
+
+  gzip on;
+  gzip_http_version 1.1;
+  gzip_disable      "MSIE [1-6]\.";
+  gzip_min_length   256;
+  gzip_vary         on;
+  gzip_proxied      expired no-cache no-store private auth;
+  gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+  gzip_comp_level   9;
+
+
+  root /usr/share/nginx/html;
+
+
+  location / {
+    try_files $uri $uri/ /index.html =404;
+  }
+
+}

alloy.ui/docker-compose.yml

@@ -0,0 +1 @@
+version: '3.6'

alloy.ui/dockerfile

@@ -0,0 +1,33 @@
+FROM node as builder
+
+COPY package.json package-lock.json ./
+COPY ./modules/* /modules/
+
+# Storing node modules on a separate layer will prevent unnecessary npm install at each build
+RUN npm set progress=false && \
+    npm config set depth 0 && \
+    npm cache clean --force && \
+    npm config set unsafe-perm true
+
+RUN npm i && mkdir /ng-app && cp -R ./node_modules ./ng-app
+
+WORKDIR /ng-app
+
+COPY . .
+
+RUN $(npm bin)/ng build --prod
+
+### Stage 2: Setup ###
+
+FROM nginx:1.13.3-alpine
+
+COPY default.conf /etc/nginx/conf.d/default.conf
+
+RUN rm -rf /usr/share/nginx/html/*
+
+COPY --from=builder /ng-app/dist/alloy /usr/share/nginx/html
+
+# Build Angular app in production mode and store artifacts in dist folder
+RUN rm -f ./src/assets/config/settings.env.json
+
+ENTRYPOINT ["nginx", "-g", "daemon off;"]