diff options
Diffstat (limited to 'mod/onboardingapi')
| -rw-r--r-- | mod/onboardingapi/Dockerfile | 33 | ||||
| -rw-r--r-- | mod/onboardingapi/dcae_cli/_version.py | 2 | ||||
| -rw-r--r-- | mod/onboardingapi/pom.xml | 3 | ||||
| -rw-r--r-- | mod/onboardingapi/setup.py | 6 | ||||
| -rw-r--r-- | mod/onboardingapi/tox.ini | 2 |
5 files changed, 30 insertions, 16 deletions
diff --git a/mod/onboardingapi/Dockerfile b/mod/onboardingapi/Dockerfile index d302b51..d25d183 100644 --- a/mod/onboardingapi/Dockerfile +++ b/mod/onboardingapi/Dockerfile @@ -1,26 +1,39 @@ -FROM python:3.7-alpine - -ARG UID=1000 -ARG GID=1000 +# ============LICENSE_START======================================================= +# Copyright 2020 Deutsche Telekom. 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +FROM nexus3.onap.org:10001/onap/integration-python:7.0.1 ENV SERVER_URL=https://git.onap.org/dcaegen2/platform/plain/mod ENV PATH_COMPONENT_SPEC=/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json ENV PATH_DATA_FORMAT=/component-json-schemas/data-format/dcae-cli-v1/data-format-schema.json ENV PG_CONN= -COPY . /code -WORKDIR /code +COPY --chown=onap:onap . /app + +USER root + RUN apk update && \ apk add --virtual build-deps gcc python3-dev musl-dev && \ apk add postgresql-dev bash && \ - addgroup -g $GID dcaemod && \ - adduser -s /bin/bash -u $UID -G dcaemod -D dcaemod && \ mkdir schemas && \ wget -O schemas/compspec.json $SERVER_URL$PATH_COMPONENT_SPEC && \ wget -O schemas/dataformat.json $SERVER_URL$PATH_DATA_FORMAT && \ pip install . +USER onap + EXPOSE 8080 -USER dcaemod -CMD /code/start.sh +CMD /app/start.sh diff --git a/mod/onboardingapi/dcae_cli/_version.py b/mod/onboardingapi/dcae_cli/_version.py index a636b5e..cc7b983 100644 --- a/mod/onboardingapi/dcae_cli/_version.py +++ b/mod/onboardingapi/dcae_cli/_version.py @@ -19,4 +19,4 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -*- coding: utf-8 -*- -__version__ = "2.12.2" +__version__ = "2.12.3" diff --git a/mod/onboardingapi/pom.xml b/mod/onboardingapi/pom.xml index 2c85ea2..e8f97a0 100644 --- a/mod/onboardingapi/pom.xml +++ b/mod/onboardingapi/pom.xml @@ -2,6 +2,7 @@ <!-- ================================================================================ Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. +Copyright 2020 Deutsche Telekom. 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. @@ -22,7 +23,7 @@ limitations under the License. <groupId>org.onap.dcaegen2.platform.mod</groupId> <artifactId>dcaegen2-platform-mod-onboardingapi</artifactId> <name>dcaegen2-platform-mod-onboardingapi</name> - <version>2.12.2-SNAPSHOT</version> + <version>2.12.3-SNAPSHOT</version> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/mod/onboardingapi/setup.py b/mod/onboardingapi/setup.py index 6ad35a7..12eabc0 100644 --- a/mod/onboardingapi/setup.py +++ b/mod/onboardingapi/setup.py @@ -2,6 +2,7 @@ # org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright 2020 Deutsche Telekom. 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. @@ -44,15 +45,14 @@ setup( setup_requires=['pytest-runner'], install_requires=[ 'Werkzeug==0.16.1', - 'python-consul<1.0.0', + 'python-consul<1.0.0', 'six', 'sqlalchemy', 'SQLAlchemy-Utils', 'click>=6.0,<7.0', 'jsonschema', 'terminaltables', - 'psycopg2==2.7.5', - 'psycopg2-binary==2.7.5', + 'psycopg2-binary==2.8.5', 'genson', 'flask-restplus', 'onap-dcae-discovery-client>=2.0.0', diff --git a/mod/onboardingapi/tox.ini b/mod/onboardingapi/tox.ini index addb463..6212c5e 100644 --- a/mod/onboardingapi/tox.ini +++ b/mod/onboardingapi/tox.ini @@ -1,6 +1,6 @@ # content of: tox.ini , put in same dir as setup.py [tox] -envlist = py37 +envlist = py37, py38 [testenv] deps= |