Build UI during package instead of install

cmd/build

@@ -36,9 +36,13 @@ fi
 # Builds all docker images
 echo Building docker images
 
-# Build user interface
-echo Building user interface
-if docker build -t test-run/ui -f modules/ui/ui.Dockerfile . ; then
+# Check if UI has already been built (not if -l was used during install)
+if [ ! -d "modules/ui/dist" ]; then
+  cmd/build_ui
+fi
+
+# Build UI image
+if docker build -t testrun/ui -f modules/ui/ui.Dockerfile . ; then
   echo Successully built the user interface
 else
   echo An error occured whilst building the user interface

cmd/build_ui

@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Build the UI
+echo Building user interface
+cd modules/ui
+
+# Run UI build commands
+npm install
+npm run build
+
+# Return back to root dir
+cd ../..

cmd/package

@@ -16,6 +16,12 @@
 
 # Creates a package for Testrun
 
+# Check that user is not root
+if [[ "$EUID" == 0 ]]; then
+    echo "Must not run as root. Use cmd/package as regular user"
+    exit 1
+fi
+
 MAKE_SRC_DIR=make
 MAKE_CONTROL_DIR=make/DEBIAN/control
 
@@ -25,10 +31,10 @@ version=$(grep -R "Version: " $MAKE_CONTROL_DIR | awk '{print $2}')
 # Replace invalid characters
 version="${version//./_}"
 
-# Delete existing make files
-rm -rf $MAKE_SRC_DIR/usr
+echo Building package for testrun v${version}
 
 # Delete existing make files
+echo Cleaning up previous build files
 rm -rf $MAKE_SRC_DIR/usr
 
 # Copy testrun script to /bin
@@ -63,6 +69,9 @@ cp -r local/root_certs $MAKE_SRC_DIR/usr/local/testrun/local/
 # Copy framework and modules into testrun folder
 cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun
 
+# Build the UI
+cmd/build_ui
+
 # Build .deb file
 dpkg-deb --build --root-owner-group make
 

cmd/prepare

@@ -20,6 +20,6 @@
 echo Installing system dependencies
 
 # Install system dependencies
-sudo apt-get update && sudo apt-get install openvswitch-common openvswitch-switch python3 libpangocairo-1.0-0 ethtool
+sudo apt-get update && sudo apt-get install openvswitch-common openvswitch-switch python3 libpangocairo-1.0-0 ethtool npm
 
 echo Finished installing system dependencies

framework/python/src/core/testrun.py

@@ -216,7 +216,7 @@ def _load_test_reports(self, device):
         'test',
         device.mac_addr.replace(':',''),
         'report.json')
-        
+
       if not os.path.isfile(report_json_file_path):
         # Revert to pre 1.3 file path
         report_json_file_path = os.path.join(
@@ -463,7 +463,7 @@ def start_ui(self):
 
     try:
       client.containers.run(
-            image='test-run/ui',
+            image='testrun/ui',
             auto_remove=True,
             name='tr-ui',
             hostname='testrun.io',

modules/ui/angular.json

@@ -32,7 +32,7 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "1000kb",
+                  "maximumWarning": "1500kb",
                   "maximumError": "3000kb"
                 },
                 {
@@ -93,6 +93,7 @@
     }
   },
   "cli": {
-    "schematicCollections": ["@angular-eslint/schematics"]
+    "schematicCollections": ["@angular-eslint/schematics"],
+    "analytics": false
   }
 }

modules/ui/ui.Dockerfile

@@ -12,17 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Image name: test-run/ui
-FROM node@sha256:ffebb4405810c92d267a764b21975fb2d96772e41877248a37bf3abaa0d3b590 as build
-
-WORKDIR /modules/ui
-COPY modules/ui/ /modules/ui
-RUN npm install
-RUN npm run build
-
+# Image name: testrun/ui
 FROM nginx@sha256:4c0fdaa8b6341bfdeca5f18f7837462c80cff90527ee35ef185571e1c327beac
 
-COPY --from=build /modules/ui/dist/ /usr/share/nginx/html
+COPY /modules/ui/dist/ /usr/share/nginx/html
 
 EXPOSE 8080