From: Ioakeim Samaras <ioakeim.samaras@ericsson.com>
Date: Wed, 26 Jun 2019 08:52:18 +0000 (+0000)
Subject: Merge "[ui] Fix docker build for UI container"
X-Git-Tag: 2.0.0~69
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=af56fc5c4d0797e35a23dad8a00bdfe9d78e05ad;hp=4e2bd9020647e9bdff04e0541c53d2edf73c93ac

Merge "[ui] Fix docker build for UI container"
---

diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
index ee710a1..cec47f9 100644
--- a/docker/ui/Dockerfile
+++ b/docker/ui/Dockerfile
@@ -14,5 +14,9 @@
 # limitations under the License.
 #
 
+FROM maven:3.6.1-jdk-11 as build
+RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation/repo
+RUN cd /opt/akraino/validation/repo/ui && mvn clean install
+
 FROM tomcat:8.5.37
-COPY ./AECBlueprintValidationUI.war /usr/local/tomcat/webapps
\ No newline at end of file
+COPY  --from=build /opt/akraino/validation/repo/ui/target/AECBlueprintValidationUI.war /usr/local/tomcat/webapps
diff --git a/docker/ui/Makefile b/docker/ui/Makefile
index 5e2d074..db91c1e 100644
--- a/docker/ui/Makefile
+++ b/docker/ui/Makefile
@@ -14,14 +14,10 @@
 # limitations under the License.                                             #
 ##############################################################################
 
-.PHONY: prepare
-prepare:
-	ln -f ../../ui/target/AECBlueprintValidationUI.war AECBlueprintValidationUI.war
-
 .PHONY: all
-all: prepare .push_image .push_manifest
+all: .push_image .push_manifest
 
 .PHONY: build
-build: prepare .build
+build: .build
 
-include ../build.mk
\ No newline at end of file
+include ../build.mk