From 626ee392a16840390b11192422f524ce748699b5 Mon Sep 17 00:00:00 2001
From: Alexander Mazuruk <a.mazuruk@samsung.com>
Date: Thu, 18 Feb 2021 17:16:29 +0100
Subject: Change python baseOS img to integration-python

Switched to latest version (current seccom recommndation)

Benefits from switching over:
* minimal {java11,python} images maintained by integration team
* using currently "blessed by seccom" versions (:latest tag used)
* should limit spread of legal issues across layers
* integration images will be the first to have automated compliance
  documentation
* should limit spread of base layers (contributing to deployment
  footprint - more base layers = more to download, more to store etc...)

Issue-ID: INT-1864
Issue-ID: DCAEGEN2-2420
Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
Change-Id: Ia0fec819dc4f83f4ca177f40cc012f9359da4bdc
---
 Changelog.md       |  4 ++++
 Dockerfile         | 10 ++++++----
 pom.xml            |  2 +-
 setup.py           |  2 +-
 tox.ini            |  4 ++--
 version.properties |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f42bbc6..d083d99 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@ 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/).
 
+## [2.5.4] - 2/23/2021
+* Change base image to one provided by integration team
+* Run in Python 3.9
+
 ## [2.5.3] - 7/22/2020
 * Run in Python 3.8
 * Add py38 for unit testing
diff --git a/Dockerfile b/Dockerfile
index db32b24..091c343 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8.2-alpine3.11
+FROM nexus3.onap.org:10001/onap/integration-python:8.0.0
 MAINTAINER tommy@research.att.com
 
 EXPOSE 10000
@@ -6,11 +6,13 @@ EXPOSE 10000
 # it is an ONAP requirement to make, and switch to, a non root user
 ARG user=onap
 ARG group=onap
-RUN addgroup -S $group && adduser -S -D -h /home/$user $user $group && \
+
+USER root
+RUN mkdir -p /home/$user && \
     chown -R $user:$group /home/$user &&  \
-    mkdir /var/log/$user && \
+    mkdir -p /var/log/$user && \
     chown -R $user:$group /var/log/$user && \
-    mkdir /app && \
+    mkdir -p /app && \
     chown -R $user:$group /app
 WORKDIR /app
 
diff --git a/pom.xml b/pom.xml
index 10c2a32..1584232 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.platform</groupId>
   <artifactId>configbinding</artifactId>
   <name>dcaegen2-platform-configbinding</name>
-  <version>2.5.3-SNAPSHOT</version>
+  <version>2.5.4-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 191a14f..53685fd 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="config_binding_service",
-    version="2.5.3",
+    version="2.5.4",
     packages=find_packages(exclude=["tests.*", "tests"]),
     author="Tommy Carpenter",
     author_email="tommy@research.att.com",
diff --git a/tox.ini b/tox.ini
index 6758393..facc40e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 [tox]
-envlist = py37,py38
+envlist = py38,py39
 
 [testenv]
 deps=
@@ -33,7 +33,7 @@ commands=
     coverage xml -i
 
 [testenv:flake8]
-basepython = python3.8
+basepython = python3.9
 skip_install = true
 deps = flake8
 commands = flake8 setup.py config_binding_service tests
diff --git a/version.properties b/version.properties
index f15ca21..f395bfd 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2
 minor=5
-patch=3
+patch=4
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg