Переглянути джерело

Adding host name support (customercentral-poc.oracle.com)

bodicsek 3 роки тому
батько
коміт
49f3c888cb

+ 1 - 1
deployment/helm-chart/templates/ingress.yaml

@@ -21,7 +21,7 @@ spec:
   tls: {}
   tls: {}
   routes:
   routes:
     - kind: Rule
     - kind: Rule
-      match: PathPrefix(`{{ .Values.pathPrefix }}`)
+      match: Host(`{{ .Values.host }}`) && PathPrefix(`{{ .Values.pathPrefix }}`)
       middlewares:
       middlewares:
         - name: {{ .Values.appName }}-middleware-strip
         - name: {{ .Values.appName }}-middleware-strip
       services:
       services:

+ 1 - 0
deployment/helm-chart/values.yaml

@@ -6,4 +6,5 @@ appName: "occ-fw-ui"
 appVersion: 1.0.0
 appVersion: 1.0.0
 imageRegistry: "iad.ocir.io/cesdev"
 imageRegistry: "iad.ocir.io/cesdev"
 imagePullSecret: ocirsecret
 imagePullSecret: ocirsecret
+host: "customercentral-poc.oracle.com"
 pathPrefix: "/occ/ui/"
 pathPrefix: "/occ/ui/"

+ 6 - 2
ojet.config.js

@@ -4,13 +4,17 @@
   as shown at https://oss.oracle.com/licenses/upl/
   as shown at https://oss.oracle.com/licenses/upl/
 
 
 */
 */
-
+const package = require("./package.json");
 const merge = require("webpack-merge").merge;
 const merge = require("webpack-merge").merge;
 
 
 const developmentConfig = {
 const developmentConfig = {
   devServer: {
   devServer: {
     https: false,
     https: false,
-    port: 8000
+    port: 8000,
+    allowedHosts: [
+      "localhost",
+      package.config.host
+    ]
   }
   }
 };
 };
 
 

+ 4 - 3
package.json

@@ -1,16 +1,17 @@
 {
 {
   "name": "occ-fw-ui",
   "name": "occ-fw-ui",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "config": {
   "config": {
+    "host": "customercentral-poc.oracle.com",
     "registry": "iad.ocir.io/cesdev"
     "registry": "iad.ocir.io/cesdev"
   },
   },
   "scripts": {
   "scripts": {
-    "start": "ojet serve",
+    "start": "DEBUG='express:*' ojet serve",
     "start:container": "npm run build:container && docker run --rm -d -p 8000:8000 $npm_package_config_registry/$npm_package_name:$npm_package_version",
     "start:container": "npm run build:container && docker run --rm -d -p 8000:8000 $npm_package_config_registry/$npm_package_name:$npm_package_version",
     "build": "ojet build",
     "build": "ojet build",
     "build:container": "docker build -t $npm_package_config_registry/$npm_package_name:$npm_package_version .",
     "build:container": "docker build -t $npm_package_config_registry/$npm_package_name:$npm_package_version .",
-    "deploy": "npm run deploy:container && helm upgrade --install $npm_package_name --set appName=$npm_package_name --set appVersion=$npm_package_version --set imageRegistry=$npm_package_config_registry ./deployment/helm-chart",
+    "deploy": "npm run deploy:container && helm upgrade --install $npm_package_name --set appName=$npm_package_name --set appVersion=$npm_package_version --set host=$npm_package_config_host --set imageRegistry=$npm_package_config_registry ./deployment/helm-chart",
     "deploy:container": "npm run build:container && ./deployment/scripts/ocir-login.sh $npm_package_config_registry && docker push $npm_package_config_registry/$npm_package_name:$npm_package_version"
     "deploy:container": "npm run build:container && ./deployment/scripts/ocir-login.sh $npm_package_config_registry && docker push $npm_package_config_registry/$npm_package_name:$npm_package_version"
   },
   },
   "dependencies": {
   "dependencies": {