Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
akillibulut
/
cost-model
-ын хуулбар https://github.com/kubecost/cost-model
2
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Updating script in dockerfile entrypoint to run parent containers entrypoint script
Adding nginx CMD to dockerfile
removing echos from makefile
adding local instructions to the README

Signed-off-by: Logan Ballard <loganballard@gmail.com>

Logan Ballard 3 жил өмнө
parent
a06181ebd2
commit
08e3e47a07
5 өөрчлөгдсөн 32 нэмэгдсэн , 243 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 2 1
      ui/Dockerfile
  2. 0 2
      ui/Makefile
  3. 28 0
      ui/README.md
  4. 2 1
      ui/docker-entrypoint.sh
  5. 0 239
      ui/package-lock.json

+ 2 - 1
ui/Dockerfile
Файл харах 

@@ -13,4 +13,5 @@ COPY nginx.conf /etc/nginx/
 
 ENV BASE_URL=/model
 
 
 COPY ./docker-entrypoint.sh /usr/local/bin/
 
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
+CMD ["nginx", "-g", "daemon off;"]

+ 0 - 2
ui/Makefile
Файл харах 

@@ -2,12 +2,10 @@ BASE_URL := "/model"
 
 
 .PHONY: build
 
 build:
 
-	echo "building with base url ${BASE_URL}"
 
 	BASE_URL=${BASE_URL} npx parcel build src/index.html
 
 
 .PHONY: serve
 
 serve:
 
-	echo "serving with base url ${BASE_URL}"
 
 	BASE_URL=${BASE_URL} npx parcel serve src/index.html
 
 
 .PHONY: clean

+ 28 - 0
ui/README.md
Файл харах 

@@ -20,3 +20,31 @@ After following the installation instructions, access the UI by port forwarding:
 
 ```
 
 kubectl port-forward --namespace opencost service/opencost 9090
 
 ```
 
+
 
+## Running Locally
 
+
 
+The UI can be run locally using the `make` command.
 
+
 
+```sh
 
+$ make serve
 
+BASE_URL="/model" npx parcel serve src/index.html
 
+Server running at http://localhost:1234
 
+✨ Built in 1.04s
 
+```
 
+
 
+And can have a custom URL backend prefix.
 
+
 
+```sh
 
+$ make serve BASE_URL=test
 
+BASE_URL=test npx parcel serve src/index.html
 
+Server running at http://localhost:1234
 
+✨ Built in 746ms
 
+```
 
+
 
+In addition, similar behavior can be replicated with the docker container:
 
+
 
+```sh
 
+$ docker run -e BASE_URL_OVERRIDE=test -p 9091:9090 -d opencost-ui:latest
 
+$ curl localhost:9091
 
+<html gibberish> 
+```

+ 2 - 1
ui/docker-entrypoint.sh
Файл харах 

@@ -9,4 +9,5 @@ else
 
     sed -i "s^{PLACEHOLDER_BASE_URL}^$BASE_URL^g" /var/www/*.js
 
 fi
 
 
-exec "$@"
 
+# Run the parent (nginx) container's entrypoint script
 
+exec /docker-entrypoint.sh "$@"

+ 0 - 239
ui/package-lock.json
Файл харах 

@@ -186,12 +186,6 @@
 
         "url": "https://opencollective.com/parcel"
 
       }
 
     },
 
-    "node_modules/ora/node_modules/color-name": {
 
-      "version": "1.1.4",
 
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-      "dev": true
 
-    },
 
     "node_modules/d3-time": {
 
       "version": "2.1.1",
 
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
 
@@ -218,12 +212,6 @@
 
         "url": "https://github.com/sponsors/sindresorhus"
 
       }
 
     },
 
-    "node_modules/@parcel/codeframe/node_modules/color-name": {
 
-      "version": "1.1.4",
 
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-      "dev": true
 
-    },
 
     "node_modules/internal-slot": {
 
       "version": "1.0.3",
 
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
 
@@ -760,18 +748,6 @@
 
         "url": "https://github.com/sponsors/sindresorhus"
 
       }
 
     },
 
-    "node_modules/@parcel/codeframe/node_modules/color-convert": {
 
-      "version": "2.0.1",
 
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-      "dev": true,
 
-      "dependencies": {
 
-        "color-name": "~1.1.4"
 
-      },
 
-      "engines": {
 
-        "node": ">=7.0.0"
 
-      }
 
-    },
 
     "node_modules/@babel/helper-validator-identifier": {
 
       "version": "7.12.11",
 
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
 
@@ -1137,21 +1113,6 @@
 
         "node": ">=0.12"
 
       }
 
     },
 
-    "node_modules/@parcel/codeframe/node_modules/ansi-styles": {
 
-      "version": "4.3.0",
 
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 
-      "dev": true,
 
-      "dependencies": {
 
-        "color-convert": "^2.0.1"
 
-      },
 
-      "engines": {
 
-        "node": ">=8"
 
-      },
 
-      "funding": {
 
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
 
-      }
 
-    },
 
     "node_modules/filesize": {
 
       "version": "6.4.0",
 
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz",
 
@@ -1266,18 +1227,6 @@
 
         "semver": "bin/semver.js"
 
       }
 
     },
 
-    "node_modules/parcel/node_modules/color-convert": {
 
-      "version": "2.0.1",
 
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-      "dev": true,
 
-      "dependencies": {
 
-        "color-name": "~1.1.4"
 
-      },
 
-      "engines": {
 
-        "node": ">=7.0.0"
 
-      }
 
-    },
 
     "node_modules/is-boolean-object": {
 
       "version": "1.1.2",
 
       "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
 
@@ -2581,18 +2530,6 @@
 
         "ansi-html": "bin/ansi-html"
 
       }
 
     },
 
-    "node_modules/ora/node_modules/color-convert": {
 
-      "version": "2.0.1",
 
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-      "dev": true,
 
-      "dependencies": {
 
-        "color-name": "~1.1.4"
 
-      },
 
-      "engines": {
 
-        "node": ">=7.0.0"
 
-      }
 
-    },
 
     "node_modules/@babel/helper-module-transforms": {
 
       "version": "7.13.0",
 
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
 
@@ -2939,12 +2876,6 @@
 
         "node": ">= 0.6"
 
       }
 
     },
 
-    "node_modules/parcel/node_modules/color-name": {
 
-      "version": "1.1.4",
 
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-      "dev": true
 
-    },
 
     "node_modules/lodash.camelcase": {
 
       "version": "4.3.0",
 
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
 
@@ -4779,30 +4710,6 @@
 
         "node": ">= 8"
 
       }
 
     },
 
-    "node_modules/@parcel/markdown-ansi/node_modules/color-convert": {
 
-      "version": "2.0.1",
 
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-      "dev": true,
 
-      "dependencies": {
 
-        "color-name": "~1.1.4"
 
-      },
 
-      "engines": {
 
-        "node": ">=7.0.0"
 
-      }
 
-    },
 
-    "node_modules/wrap-ansi/node_modules/color-convert": {
 
-      "version": "2.0.1",
 
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-      "dev": true,
 
-      "dependencies": {
 
-        "color-name": "~1.1.4"
 
-      },
 
-      "engines": {
 
-        "node": ">=7.0.0"
 
-      }
 
-    },
 
     "node_modules/elliptic": {
 
       "version": "6.5.4",
 
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
 
@@ -5367,12 +5274,6 @@
 
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 
       "dev": true
 
     },
 
-    "node_modules/wrap-ansi/node_modules/color-name": {
 
-      "version": "1.1.4",
 
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-      "dev": true
 
-    },
 
     "node_modules/normalize-url": {
 
       "version": "6.1.0",
 
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
 
@@ -5732,12 +5633,6 @@
 
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
 
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
 
     },
 
-    "node_modules/@parcel/markdown-ansi/node_modules/color-name": {
 
-      "version": "1.1.4",
 
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-      "dev": true
 
-    },
 
     "node_modules/@parcel/resolver-default": {
 
       "version": "2.2.1",
 
       "resolved": "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.2.1.tgz",
 
@@ -6462,26 +6357,6 @@
 
         "url": "https://github.com/sponsors/sindresorhus"
 
       }
 
     },
 
-    "node_modules/@parcel/node-libs-browser/node_modules/safe-buffer": {
 
-      "version": "5.2.1",
 
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
 
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 
-      "dev": true,
 
-      "funding": [
 
-        {
 
-          "type": "github",
 
-          "url": "https://github.com/sponsors/feross"
 
-        },
 
-        {
 
-          "type": "patreon",
 
-          "url": "https://www.patreon.com/feross"
 
-        },
 
-        {
 
-          "type": "consulting",
 
-          "url": "https://feross.org/support"
 
-        }
 
-      ]
 
-    },
 
     "node_modules/core-js": {
 
       "version": "3.20.3",
 
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
 
@@ -6744,21 +6619,6 @@
 
         }
 
       ]
 
     },
 
-    "node_modules/@parcel/markdown-ansi/node_modules/ansi-styles": {
 
-      "version": "4.3.0",
 
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 
-      "dev": true,
 
-      "dependencies": {
 
-        "color-convert": "^2.0.1"
 
-      },
 
-      "engines": {
 
-        "node": ">=8"
 
-      },
 
-      "funding": {
 
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
 
-      }
 
-    },
 
     "node_modules/concat-map": {
 
       "version": "0.0.1",
 
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 
@@ -9012,15 +8872,6 @@
 
         "string-width": "^4.2.0"
 
       },
 
       "dependencies": {
 
-        "ansi-styles": {
 
-          "version": "4.3.0",
 
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 
-          "dev": true,
 
-          "requires": {
 
-            "color-convert": "^2.0.1"
 
-          }
 
-        },
 
         "chalk": {
 
           "version": "4.1.2",
 
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
 
@@ -9031,21 +8882,6 @@
 
             "supports-color": "^7.1.0"
 
           }
 
         },
 
-        "color-convert": {
 
-          "version": "2.0.1",
 
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-          "dev": true,
 
-          "requires": {
 
-            "color-name": "~1.1.4"
 
-          }
 
-        },
 
-        "color-name": {
 
-          "version": "1.1.4",
 
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-          "dev": true
 
-        },
 
         "has-flag": {
 
           "version": "4.0.0",
 
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 
@@ -9239,15 +9075,6 @@
 
         "chalk": "^4.1.0"
 
       },
 
       "dependencies": {
 
-        "ansi-styles": {
 
-          "version": "4.3.0",
 
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 
-          "dev": true,
 
-          "requires": {
 
-            "color-convert": "^2.0.1"
 
-          }
 
-        },
 
         "chalk": {
 
           "version": "4.1.2",
 
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
 
@@ -9258,21 +9085,6 @@
 
             "supports-color": "^7.1.0"
 
           }
 
         },
 
-        "color-convert": {
 
-          "version": "2.0.1",
 
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-          "dev": true,
 
-          "requires": {
 
-            "color-name": "~1.1.4"
 
-          }
 
-        },
 
-        "color-name": {
 
-          "version": "1.1.4",
 
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-          "dev": true
 
-        },
 
         "has-flag": {
 
           "version": "4.0.0",
 
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 
@@ -9331,12 +9143,6 @@
 
         "vm-browserify": "^1.1.2"
 
       },
 
       "dependencies": {
 
-        "safe-buffer": {
 
-          "version": "5.2.1",
 
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
 
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 
-          "dev": true
 
-        },
 
         "string_decoder": {
 
           "version": "1.3.0",
 
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
 
@@ -12796,21 +12602,6 @@
 
             "supports-color": "^7.1.0"
 
           }
 
         },
 
-        "color-convert": {
 
-          "version": "2.0.1",
 
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-          "dev": true,
 
-          "requires": {
 
-            "color-name": "~1.1.4"
 
-          }
 
-        },
 
-        "color-name": {
 
-          "version": "1.1.4",
 
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-          "dev": true
 
-        },
 
         "has-flag": {
 
           "version": "4.0.0",
 
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 
@@ -12887,21 +12678,6 @@
 
             "supports-color": "^7.1.0"
 
           }
 
         },
 
-        "color-convert": {
 
-          "version": "2.0.1",
 
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-          "dev": true,
 
-          "requires": {
 
-            "color-name": "~1.1.4"
 
-          }
 
-        },
 
-        "color-name": {
 
-          "version": "1.1.4",
 
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-          "dev": true
 
-        },
 
         "has-flag": {
 
           "version": "4.0.0",
 
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 
@@ -14521,21 +14297,6 @@
 
           "requires": {
 
             "color-convert": "^2.0.1"
 
           }
 
-        },
 
-        "color-convert": {
 
-          "version": "2.0.1",
 
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 
-          "dev": true,
 
-          "requires": {
 
-            "color-name": "~1.1.4"
 
-          }
 
-        },
 
-        "color-name": {
 
-          "version": "1.1.4",
 
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 
-          "dev": true
 
         }
 
       }
 
     },