diff options
| author |   dfarrelly <david.farrelly@est.tech> | 2019-05-08 07:30:42 +0000 |
|---|---|---|
| committer | dfarrelly <david.farrelly@est.tech> | 2019-05-08 07:30:42 +0000 |
| commit | 646988afe38171687a21c91a194dfab84ceb2806 (patch) | |
| tree | 8dea2051bc4423171f6c217902b9025612db837a | |
| parent | d5f3810292e6c85d123de7aa28fa0c860a21c183 (diff) | |
Update base image and versions4.0.0-ONAP1.0.1dublin
*Update base docker image
*Update versions
*Fix incorrect MR hostname
Issue-ID: DCAEGEN2-1486
Change-Id: I2b6ff584353c856128f036c1f687b3432e88b4c2
Signed-off-by: dfarrelly <david.farrelly@est.tech>
| -rw-r--r-- | dpo/blueprints/k8s-pm-mapper.yaml | 6 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/resources/Dockerfile | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/dpo/blueprints/k8s-pm-mapper.yaml b/dpo/blueprints/k8s-pm-mapper.yaml index eabe51e..b331e41 100644 --- a/dpo/blueprints/k8s-pm-mapper.yaml +++ b/dpo/blueprints/k8s-pm-mapper.yaml @@ -22,13 +22,13 @@ 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: type: string description: Docker image to be used - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.0.1" replicas: type: integer description: Number of instances @@ -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 @@ -26,7 +26,7 @@ <groupId>org.onap.dcaegen2.services</groupId> <artifactId>pm-mapper</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <parent> <groupId>org.onap.oparent</groupId> 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 diff --git a/version.properties b/version.properties index 32acbf9..fdf525c 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file |