summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Jagiello <michal.jagiello@t-mobile.pl>2020-08-13 14:02:27 +0000
committerMichal Jagiello <michal.jagiello@t-mobile.pl>2020-08-13 14:02:27 +0000
commitddba82af8a3a85c2fdf26349b9bb88e2d0a2c0d8 (patch)
tree2af97bb34db0846fe19b4bb9b7365cb37c32ce20
parent92e323d4c86252e1f9e92d8e2a9b97db921655ee (diff)
Run distributorapi in Python 3.82.12.2
Use official ONAP Python base image Issue-ID: DCAEGEN2-2292 Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl> Change-Id: I5fc17e0257a31aa35fe81e24b97c364b73e5c72a
-rw-r--r--mod/distributorapi/Dockerfile14
-rw-r--r--mod/distributorapi/tox.ini2
2 files changed, 6 insertions, 10 deletions
diff --git a/mod/distributorapi/Dockerfile b/mod/distributorapi/Dockerfile
index f82607d..84ee6b5 100644
--- a/mod/distributorapi/Dockerfile
+++ b/mod/distributorapi/Dockerfile
@@ -1,5 +1,6 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2019 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.
@@ -13,16 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ============LICENSE_END=========================================================
-FROM python:3.7-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:latest
-ARG UID=1000
-ARG GID=1000
-COPY . /code
-WORKDIR /code
-RUN pip install . && \
- addgroup -g $GID dcaemod && \
- adduser -s /bin/bash -u $UID -G dcaemod -D dcaemod
-USER dcaemod
+COPY --chown=onap:onap . /app
+RUN pip install .
EXPOSE 8080
ENV DISTRIBUTOR_DEBUG=0
+ENV PATH="$PATH:/home/onap/.local/bin"
CMD start-distributor-api
diff --git a/mod/distributorapi/tox.ini b/mod/distributorapi/tox.ini
index a0bebea..3f8a43b 100644
--- a/mod/distributorapi/tox.ini
+++ b/mod/distributorapi/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py37
+envlist = py37,py38
[testenv]
deps=