Cherry-pick c1ce8ac Changed build to not make osm-im lib-osm-openvim

Change-Id: Ibca462f24900cbd1c30ada08c3c5eb51fe6d30b2
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --git a/Dockerfile b/Dockerfile
index 6f2acac..6f1f208 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,22 @@
+# Copyright 2018 Telefonica S.A.
+#
+# 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.
+
+# This Dockerfile is intented for devops and deb package generation
+#
+# Use docker/Dockerfile-local for running osm/RO in a docker container from source
+
 FROM ubuntu:16.04
 
 RUN  apt-get update && \
@@ -19,3 +38,11 @@ RUN  apt-get update && \
   DEBIAN_FRONTEND=noninteractive pip install untangle && \
   DEBIAN_FRONTEND=noninteractive pip install -e git+https://github.com/python-oca/python-oca#egg=oca
 
+
+# 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  {} ";"
+

diff --git a/Makefile b/Makefile
index 8e0da21..33deb4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,25 @@
+# Copyright 2018 Telefonica S.A.
+#
+# 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.
+
 .PHONY: all test clean
 
 SHELL := /bin/bash
 
 BRANCH ?= master
 
-all: lib-openvim osm-im
+all:  #  lib-openvim    # osm-im
        $(MAKE) clean_build build
        $(MAKE) clean_build package
 
@@ -74,7 +89,7 @@ package: prepare
 snap:
        echo "Nothing to be done yet"
 
-install:
+install: lib-openvim osm-im
        dpkg -i IM/deb_dist/python-osm-im*.deb
        dpkg -i openvim/.build/python-lib-osm-openvim*.deb
        dpkg -i .build/python-osm-ro*.deb