aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lucas <jflos@sonoris.net>2021-06-29 15:11:24 -0400
committerJack Lucas <jflos@sonoris.net>2021-07-01 11:45:44 -0400
commit3894346dff6ec673db5cbd49395328791e7c5fe1 (patch)
tree340ff8cb6b4424a600ed6b04838bbcb28a6a44ea
parent59e8a4df36611631c20213c632c6809317039d3a (diff)
Remove VOLUME definition from PH Dockerfile5.1.3
The DCAE policy handler Dockerfile defined a VOLUME at a relative path "logs". The VOLUME isn't needed and in some deployment environments prevents the policy handler from starting. Removing it. Issue-ID: DCAEGEN2-2849 Signed-off-by: Jack Lucas <jflos@sonoris.net> Change-Id: Ie8a9610880d518bb53c7bd2d414026a7c8af7e77
-rw-r--r--Changelog.md8
-rw-r--r--Dockerfile3
-rw-r--r--pom.xml3
-rw-r--r--setup.py3
-rw-r--r--version.properties2
5 files changed, 11 insertions, 8 deletions
diff --git a/Changelog.md b/Changelog.md
index 90c2abc..e7b18e7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,9 +4,11 @@ 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/).
-
-## [5.1.2] - 03/03/2021
+## [5.1.3] - 2021-07-01
+### Changed
+ - [DCAEGEN2-2849](https://jira.onap.org/browse/DCAEGEN2-2849) - Remove VOLUME definition in Dockerfile to prevent startup failure in recent versions of containerd. (See also https://github.com/containerd/containerd/issues/5547)
+## [5.1.2] - 03/03/2021
### Changed
- [DCAEGEN2-2652](https://jira.onap.org/browse/DCAEGEN2-2652) - Policy Handler startup error; CherryPy/requirements update
-## [5.1.1] - 03/02/2021
+## [5.1.1] - 03/02/2021
diff --git a/Dockerfile b/Dockerfile
index eb8c581..40ab6ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
# ================================================================================
# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
# Copyright 2020 Deutsche Telekom. All rights reserved.
+# Copyright (c) 2021 J. F. Lucas. 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.
@@ -51,7 +52,5 @@ RUN mkdir -p logs \
USER $user
-VOLUME logs
-
# Run run_policy.sh when the container launches
CMD ["./run_policy.sh"]
diff --git a/pom.xml b/pom.xml
index 2cca1b6..2a724c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,6 +3,7 @@
================================================================================
Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
Copyright 2020 Deutsche Telekom. All rights reserved.
+Copyright 2021 J. F. Lucas. 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.
@@ -30,7 +31,7 @@ limitations under the License.
<groupId>org.onap.dcaegen2.platform</groupId>
<artifactId>policy-handler</artifactId>
<name>dcaegen2-platform-policy-handler</name>
- <version>5.1.2-SNAPSHOT</version>
+ <version>5.1.3-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/setup.py b/setup.py
index 4356acc..01a573c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
# ================================================================================
# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
# Copyright 2020 Deutsche Telekom. All rights reserved.
+# Copyright (c) 2021 J. F. Lucas. 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.
@@ -23,7 +24,7 @@ from setuptools import setup
setup(
name='policyhandler',
description='DCAE-Controller policy-handler to communicate with policy-engine',
- version="5.1.2",
+ version="5.1.3",
author='Alex Shatov',
packages=['policyhandler'],
zip_safe=False,
diff --git a/version.properties b/version.properties
index 3abb64b..2ef7b32 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=5
minor=1
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT