summaryrefslogtreecommitdiffstats
path: root/mod/designtool/designtool-web
diff options
context:
space:
mode:
authorAndrew Gauld <agauld@att.com>2020-03-27 15:30:36 +0000
committerAndrew Gauld <agauld@att.com>2020-03-27 15:42:57 +0000
commitf6a8a8322d09d5f6012167d298dea6f0471cb82c (patch)
tree0b54d532635e0657db3fc05cb46e2529b92d1ee2 /mod/designtool/designtool-web
parent715442db4147980f3fb17a240a396a8e826f0f04 (diff)
Update images to run as non-root2.12.11.0.2
Images updated and the new versions are: adapter.acumos:1.0.2 mod.distributorapi:1.0.1 mod.onboardingapi:2.12.1 mod.designtool-web:1.0.2 mod.genprocessor-job:1.0.1 mod.genprocessor-http:1.0.1 mod.runtime-web:1.0.2 Note: image names all start with "onap/org.onap.dcaegen2.platform." designtool-web was already running as a non-root user. The others have been changed to create user "dcaemod" and run as that user. The listen port numbers on mod.distributorapi, mod.onboardingapi, and mod.genprocessor-http are changed from 80 to 8080. URLs in designtool-web, distributorapi, and genprocessor-job are adjusted to reflect the new port numbers. Change-Id: I510122952666c21cb92f3f64552e99d50af7c355 Issue-ID: DCAEGEN2-2170 Signed-off-by: Andrew Gauld <agauld@att.com>
Diffstat (limited to 'mod/designtool/designtool-web')
-rw-r--r--mod/designtool/designtool-web/pom.xml3
-rwxr-xr-xmod/designtool/designtool-web/sh/start.sh11
2 files changed, 4 insertions, 10 deletions
diff --git a/mod/designtool/designtool-web/pom.xml b/mod/designtool/designtool-web/pom.xml
index 8806964..fc24024 100644
--- a/mod/designtool/designtool-web/pom.xml
+++ b/mod/designtool/designtool-web/pom.xml
@@ -27,6 +27,7 @@ limitations under the License.
<version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>designtool-web</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>war</packaging>
<name>dcaegen2-platform-mod-designtool-web</name>
<properties>
@@ -84,7 +85,7 @@ limitations under the License.
<dependency>
<groupId>org.onap.dcaegen2.platform.mod</groupId>
<artifactId>nifi-war-to-jar</artifactId>
- <version>${project.version}</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/mod/designtool/designtool-web/sh/start.sh b/mod/designtool/designtool-web/sh/start.sh
index 8658983..b0393de 100755
--- a/mod/designtool/designtool-web/sh/start.sh
+++ b/mod/designtool/designtool-web/sh/start.sh
@@ -51,16 +51,9 @@ prop_replace 'nifi.web.proxy.context.path' "${NIFI_WEB_PROXY_CO
# replace value conditionally if the property name exists otherwise append
if grep -q 'nifi.dcae.jars.index.url' $nifi_props_file
then
- prop_replace 'nifi.dcae.jars.index.url' "${NIFI_DCAE_JARS_INDEX_URL:-http://genprocessor-http/nifi-jars/}"
+ prop_replace 'nifi.dcae.jars.index.url' "${NIFI_DCAE_JARS_INDEX_URL:-http://genprocessor-http:8080/nifi-jars/}"
else
- prop_append 'nifi.dcae.jars.index.url' "${NIFI_DCAE_JARS_INDEX_URL:-http://genprocessor-http/nifi-jars/}"
-fi
-
-if grep -q 'nifi.ui.dcae.distibutor.api.url' $nifi_props_file
-then
- prop_replace 'nifi.ui.dcae.distibutor.api.url' "${NIFI_DCAE_DISTRIBUTOR_API_URL:-http://distributor-api}"
-else
- prop_append 'nifi.ui.dcae.distibutor.api.url' "${NIFI_DCAE_DISTRIBUTOR_API_URL:-http://distributor-api}"
+ prop_append 'nifi.dcae.jars.index.url' "${NIFI_DCAE_JARS_INDEX_URL:-http://genprocessor-http:8080/nifi-jars/}"
fi
. "${scripts_dir}/update_cluster_state_management.sh"