From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 29 Nov 2018 15:36:50 +0000 (+0100)
Subject: Revert "Revert "Dockerfile in light-ui: use deb package from repo""
X-Git-Tag: v5.0.0~5
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3fad2ea5f974bada85a70a96a837285ccda679a3;p=osm%2Fdevops.git

Revert "Revert "Dockerfile in light-ui: use deb package from repo""

This reverts commit 28f76d9d08b104e3a209b1e7970411484ba7be48.

Change-Id: Id7cf3a3bc9c83f85605e30a97e97ab74f89dea80
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index 4440b9a0..1e54567a 100644
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -1,20 +1,26 @@
 FROM ubuntu:16.04
 
-WORKDIR /usr/share/osm-lightui
-
-RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor
+RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor curl software-properties-common
 RUN npm install -g bower
+RUN ln -s /usr/bin/nodejs /usr/bin/node
+RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 
-ARG LWUI_VERSION=
-RUN git clone https://osm.etsi.org/gerrit/osm/LW-UI /usr/share/osm-lightui && echo LWUI_VERSION
+ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
+ARG RELEASE=ReleaseFOUR-daily
+ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
+ARG REPOSITORY=testing
+ARG LWUI_VERSION
 
-RUN ln -s /usr/bin/nodejs /usr/bin/node
-RUN bower install --allow-root
+RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
+RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} LW-UI" && apt-get update
+
+RUN apt-get install -y osm-lightui${LWUI_VERSION} && \
+    rm -rf /var/lib/apt/lists/*
 
+WORKDIR /usr/share/osm-lightui
+RUN bower install --allow-root
 RUN pip install -r requirements.txt
 RUN pip install uwsgi
-#
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 RUN cp /usr/share/osm-lightui/nginx-app.conf /etc/nginx/sites-available/default
 RUN cp /usr/share/osm-lightui/supervisor-app.conf /etc/supervisor/conf.d/
 
diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index ced304aa..5f799205 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -19,7 +19,7 @@ CONTAINER_NAME ?= $(LOWER_MDG)
 CMD_DOCKER_ARGS ?= -q
 DOCKER_ARGS     = $(CMD_DOCKER_ARGS)
 
-DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui
 
 DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
 
@@ -31,6 +31,9 @@ $(MKBUILD):
 $(MKBUILD)/.dep_policy-module:
 	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m POL -p policy-module > $@
 
+$(MKBUILD)/.dep_lightui:
+	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m LW-UI -p lightui > $@
+
 $(MKBUILD)/.dep_%:
 	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@
 
@@ -50,7 +53,7 @@ build: $(MKBUILD) $(DEPS_TARGETS)
                    --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_policy-module) \
                    --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \
                    --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \
-                   --build-arg LWUI_VERSION==$(shell date +%s) \
+                   --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \
                    $(DOCKER_ARGS) .
 
 clean: