Merge remote-tracking branch 'origin/stage' into feature/IOT-1276-Col…

…umn-administration-on-gateway-table
OS2iot · Dec 5, 2023 · b4011f0 · b4011f0
2 parents 23fc590 + a9603f3
commit b4011f0
Show file tree

Hide file tree

Showing 7 changed files with 13,454 additions and 15,073 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://mherman.org/blog/dockerizing-an-angular-app/
 # base image
-FROM node:14-alpine as DEV
+FROM node:16-alpine as DEV
 
 # removed this for now
 # install chrome for protractor tests

diff --git a/angular.json b/angular.json
@@ -25,7 +25,7 @@
             "assets": [
               "src/favicon.ico",
               "src/assets",
-              { "glob": "**/*", "input": "node_modules/monaco-editor", "output": "assets/monaco-editor" }
+              { "glob": "**/*", "input": "node_modules/monaco-editor", "output": "/assets/monaco/" }
             ],
             "styles": [
               "./node_modules/animate.css/animate.min.css",