[ui] Fix docker build for UI container

The build is failing because it expects the java code to be built
before copying the executable inside the ui container

JIRA: VAL-31

Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Change-Id: I1f3d92bab9d1de8fbe93a2da0667c82aca44789f

diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
index ee710a1..cec47f9 100644 (file)
--- a/docker/ui/Dockerfile
+++ b/docker/ui/Dockerfile
@@ -14,5 +14,9 @@
 # limitations under the License.
 #
 
 # 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
 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 (file)
--- a/docker/ui/Makefile
+++ b/docker/ui/Makefile
@@ -14,14 +14,10 @@
 # limitations under the License.                                             #
 ##############################################################################
 
 # limitations under the License.                                             #
 ##############################################################################
 

-.PHONY: prepare
-prepare:
-       ln -f ../../ui/target/AECBlueprintValidationUI.war AECBlueprintValidationUI.war
-

 .PHONY: all
 .PHONY: all

-all: prepare .push_image .push_manifest
+all: .push_image .push_manifest

 
 .PHONY: build
 
 .PHONY: build

-build: prepare .build
+build: .build

 
 

-include ../build.mk
\ No newline at end of file
+include ../build.mk