diff options
| -rw-r--r-- | Changelog.md | 6 | ||||
| -rw-r--r-- | datafile-app-server/pom.xml | 3 | ||||
| -rwxr-xr-x | datafile-app-server/src/main/docker/Dockerfile | 30 | ||||
| -rw-r--r-- | pom.xml | 3 | ||||
| -rw-r--r-- | version.properties | 4 |
5 files changed, 28 insertions, 18 deletions
diff --git a/Changelog.md b/Changelog.md index 79097808..0dc2c456 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.6.0] - 25/02/2021 +### Changed +- docker base image to integration (from debian based to alpine based) +- java version bump from 11.0.8 to 11.0.9 +- remove exec file permission for config file + ## [1.5.5] - 09/03/2021 ### Fixed - make hostname verification configurable diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml index 9c895861..4b84f6ed 100644 --- a/datafile-app-server/pom.xml +++ b/datafile-app-server/pom.xml @@ -4,6 +4,7 @@ ~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved. ~ Copyright (C) 2018-2021 Nordix Foundation. All rights reserved. ~ Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + ~ Copyright (c) 2021 Samsung Electronics. All rights reserved. ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.collectors</groupId> <artifactId>datafile</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.collectors.datafile</groupId> diff --git a/datafile-app-server/src/main/docker/Dockerfile b/datafile-app-server/src/main/docker/Dockerfile index 73d09bfe..26a2ca4d 100755 --- a/datafile-app-server/src/main/docker/Dockerfile +++ b/datafile-app-server/src/main/docker/Dockerfile @@ -2,6 +2,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2019 Nordix Foundation. # Copyright (C) 2020 Nokia. +# Copyright (C) 2021 Samsung Electronics. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,28 +19,29 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= # -FROM openjdk:11.0.8-jre-slim +FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 EXPOSE 8100 8433 -RUN apt-get update && apt-get install -y \ - vim \ - curl +ARG user=datafile +ARG group=datafile +USER root WORKDIR /opt/app/datafile -RUN mkdir -p /var/log/ONAP -RUN mkdir -p /opt/app/datafile/etc/cert/ - -RUN groupadd -r onap && useradd -ms /bin/bash datafile -g onap -RUN chown -R datafile:onap /var/log/ONAP ADD /config/application.yaml /opt/app/datafile/config/ -RUN chmod -R 777 /opt/app/datafile/config/ -USER datafile +RUN mkdir -p /var/log/ONAP /opt/app/datafile/etc/cert/ && \ + addgroup $group && adduser --system --disabled-password --no-create-home --ingroup $group $user && \ + chown -R $user:$group /var/log/ONAP /opt/app/datafile/config && \ + chmod -R u+rw /opt/app/datafile/config/ -RUN mkdir -p /home/datafile/.ssh +# required for CSIT tests +RUN apk add --no-cache openssh && \ + mkdir -p /home/$user/.ssh && \ + chown -R $user:$group /home/$user -ADD /target/datafile-app-server.jar /opt/app/datafile/ +USER $user -ENTRYPOINT ["/usr/local/openjdk-11/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"] +COPY --chown=$user:$group /target/datafile-app-server.jar /opt/app/datafile/ +ENTRYPOINT ["java", "-jar", "/opt/app/datafile/datafile-app-server.jar"] @@ -3,6 +3,7 @@ ~ ============LICENSE_START===================================================================== ~ Copyright (C) 2018-2021 NOKIA Intellectual Property. All rights reserved. ~ Copyright (C) 2018-2021 Nordix Foundation. All rights reserved. + ~ Copyright (C) 2021 Samsung Electronics. All rights reserved. ~ ============================================================================================== ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -31,7 +32,7 @@ <groupId>org.onap.dcaegen2.collectors</groupId> <artifactId>datafile</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> <name>dcaegen2-collectors.datafile</name> <description>datafile collector</description> diff --git a/version.properties b/version.properties index 1daaf2de..d76ac729 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1
-minor=5
-patch=5
+minor=6
+patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
|