From 533f64d4ae4bb971d750c84bf274729bd6163b5d Mon Sep 17 00:00:00 2001 From: tierno Date: Wed, 28 Nov 2018 10:18:41 +0000 Subject: [PATCH] adding python3-pip dependency to python3-osm-nbi package Change-Id: I7a1462f3764a53413481d53282f0bc55b0d6fa95 Signed-off-by: tierno --- Dockerfile | 13 +++++-------- Dockerfile.fromdeb | 2 +- stdeb.cfg | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c0807a..25d5d6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - # Copyright 2018 Telefonica S.A. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,9 +29,9 @@ RUN apt-get update && apt-get -y install wget git make python python3 python-pip DEBIAN_FRONTEND=noninteractive pip2 install -U stdeb # Uncomment this block to generate automatically a debian package and show info -# Set the working directory to /app -WORKDIR /app -# Copy the current directory contents into the container at /app -ADD . /app -CMD /app/devops-stages/stage-build.sh && find -name "*.deb" -exec dpkg -I {} ";" +# # Set the working directory to /app +# WORKDIR /app +# # Copy the current directory contents into the container at /app +# ADD . /app +# CMD /app/devops-stages/stage-build.sh && find -name "*.deb" -exec dpkg -I {} ";" diff --git a/Dockerfile.fromdeb b/Dockerfile.fromdeb index f6139b7..f9b0a6d 100644 --- a/Dockerfile.fromdeb +++ b/Dockerfile.fromdeb @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This creates som/NBI docker from from last stable package +# This creates osm/NBI docker from from last stable package FROM ubuntu:16.04 diff --git a/stdeb.cfg b/stdeb.cfg index 8da69fe..d7e4022 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,3 +1,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3 : python3-osm-common, python3-osm-im, python3-cherrypy3, python3-yaml, python3-jsonschema, python3-keystoneclient +Depends3 : python3-osm-common, python3-osm-im, python3-cherrypy3, python3-yaml, python3-jsonschema, python3-keystoneclient, python3-pip -- 2.25.1