From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 13 Nov 2018 15:06:45 +0000 (+0000)
Subject: Changed build to not make osm-im lib-osm-openvim
X-Git-Tag: v5.0.0~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=59bc1ce8ac4e00e970ef5152ea113ed510253875;p=osm%2FRO.git

Changed build to not make osm-im lib-osm-openvim

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

diff --git a/Dockerfile b/Dockerfile
index 6f2acac7..9957a89b 100644
--- 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 8e0da21c..33deb4e9 100644
--- 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