diff options
| author |   dfarrelly <david.farrelly@est.tech> | 2019-05-08 07:32:13 +0000 |
|---|---|---|
| committer | dfarrelly <david.farrelly@est.tech> | 2019-05-08 07:32:13 +0000 |
| commit | 7af910adcab48ee6534812d6f6341af595c76d72 (patch) | |
| tree | 41db2e0438a7e6c6ec881fff6fb3da932e13c518 | |
| parent | 91c6030d8b892c5773085692d7e9abf51e087e1a (diff) | |
Update base image and version
*Update base docker image
*Update versions
*Fix incorrect MR hostname
Issue-ID: DCAEGEN2-1486
Change-Id: Ia19aaff23963dcf4abd93e68010c44d5e0498188
Signed-off-by: dfarrelly <david.farrelly@est.tech>
| -rw-r--r-- | dpo/blueprints/k8s-pm-mapper.yaml | 4 | ||||
| -rw-r--r-- | src/main/resources/Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dpo/blueprints/k8s-pm-mapper.yaml b/dpo/blueprints/k8s-pm-mapper.yaml index eabe51e..c129357 100644 --- a/dpo/blueprints/k8s-pm-mapper.yaml +++ b/dpo/blueprints/k8s-pm-mapper.yaml @@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" - - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml" + - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml" inputs: tag_version: @@ -88,7 +88,7 @@ inputs: dmaap_mr_service_host: type: string description: DMAAP Message Router host address - default: "dmaap-mr" + default: "message-router" dmaap_mr_service_port: type: string description: DMAAP Message Router host port diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index 2f4505c..e354d13 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= # -FROM openjdk:8-jre-alpine +FROM openjdk:8u171-jre-alpine ENTRYPOINT ["/bin/sh", "-c", "nohup sh etc/reconfigure.sh & /usr/bin/java -jar /opt/app/pm-mapper/pm-mapper.jar"] ARG JAR |