From 89f2f421a741d0e3c56e3fb2deb304eacedb5a8f Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Wed, 26 Sep 2018 09:58:55 -0400 Subject: [PATCH] Use LWUI version to allow caching - use time/seconds to break cache until lwui packaging is supported - avoids usings --no-cache due to upstream npm install delays Signed-off-by: Mike Marchetti Change-Id: I5f037a955b2091e0477c7fe22674f43458436145 --- docker/light-ui/Dockerfile | 4 +++- docker/light-ui/Makefile | 3 --- docker/mk/Makefile.include | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile index f845f7ac..5cf9aa70 100644 --- a/docker/light-ui/Dockerfile +++ b/docker/light-ui/Dockerfile @@ -4,7 +4,9 @@ WORKDIR /usr/src/app RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor RUN npm install -g bower -RUN git clone https://osm.etsi.org/gerrit/osm/LW-UI /usr/src/app + +ARG LWUI_VERSION= +RUN git clone https://osm.etsi.org/gerrit/osm/LW-UI /usr/src/app && echo LWUI_VERSION RUN ln -s /usr/bin/nodejs /usr/bin/node RUN bower install --allow-root diff --git a/docker/light-ui/Makefile b/docker/light-ui/Makefile index e6381005..d64462ab 100644 --- a/docker/light-ui/Makefile +++ b/docker/light-ui/Makefile @@ -1,6 +1,3 @@ include ../mk/Makefile.include -# Currently LW-UI needs no-cache (binary version packages not yet available) -DOCKER_ARGS += $(NO_CACHE) - MDG=$(shell basename $(CURDIR)) diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index 81529f34..0c44636e 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -44,6 +44,7 @@ build: $(MKBUILD) $(DEPS_TARGETS) --build-arg NBI_VERSION==$(shell cat $(MKBUILD)/.dep_NBI) \ --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_POL) \ --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \ + --build-arg LWUI_VERSION==$(shell date +%s) \ $(DOCKER_ARGS) . clean: -- 2.25.1