diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-10-22 18:04:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-22 18:04:34 +0000 |
| commit | d1445248920f77b018642f64f4864a0d7424f74a (patch) | |
| tree | dc8b24e939a6dcfe5081817e613ce5f294b9d4c3 | |
| parent | 10c1f777859197edf43670fdf2312cecabfd06e7 (diff) | |
| parent | 85214182d907c3f61f6b9c4f7cead622b1fd2a3f (diff) | |
Merge "Correct port forwarding"
| -rwxr-xr-x | kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties | 2 | ||||
| -rw-r--r-- | kubernetes/portal/docker/init/mariadb-client/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties index 4a9e690750..8d21859b29 100755 --- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties +++ b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties @@ -58,7 +58,7 @@ log_cron = 0 * * * * ? * sessiontimeout_feed_cron = 0 0/5 * * * ? * #Front end URL -frontend_url = http://{{.Values.global.portalHostName}}:{{.Values.global.portalFEPort}}/ONAPPORTAL/applicationsHome +frontend_url = https://{{.Values.global.portalHostName}}:{{.Values.global.portalFEPort}}/ONAPPORTAL/applicationsHome # An Unqiue 128-bit value defined to indentify a specific version of diff --git a/kubernetes/portal/docker/init/mariadb-client/Dockerfile b/kubernetes/portal/docker/init/mariadb-client/Dockerfile index a656d39b02..33ca4b11b6 100644 --- a/kubernetes/portal/docker/init/mariadb-client/Dockerfile +++ b/kubernetes/portal/docker/init/mariadb-client/Dockerfile @@ -14,7 +14,7 @@ FROM boxfuse/flyway:5.0.7-alpine -ARG branch=2.0.0-ONAP +ARG branch=release-2.3.0 ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST" # Setup Corporate proxy ENV https_proxy ${HTTP_PROXY} |