Merge pull request #1522 from cliveseldon/1521_engine_makefile

Update Engine and top level makefiles

Makefile.ci

@@ -1,15 +1,15 @@
 .PHONY: build
 build:
 	@set -x && cd seldon-controller && make -f Makefile $@
-	@set -x && cd engine && make -f Makefile.ci clean $@
+	@set -x && cd engine && make -f Makefile clean $@
 
 .PHONY: push_images_private_repo
 push_images_private_repo:
 	@set -x && cd seldon-controller && make -f Makefile push_image_private_repo
-	@set -x && cd engine && make -f Makefile.ci push_image_private_repo
+	@set -x && cd engine && make -f Makefile push_image_private_repo
 
 .PHONY: clean
 clean:
-	cd engine && make -f Makefile.ci clean $@
+	cd engine && make -f Makefile clean $@
 	cd seldon-controller && make -f Makefile clean $@
 

engine/Dockerfile

@@ -1,14 +1,22 @@
-FROM openjdk:11.0.5-jre-slim
+FROM maven:3.6.3-jdk-11 as builder
+
+WORKDIR /workspace
+
+COPY pom.xml pom.xml
+COPY src/ src/
 
-ARG APP_VERSION=UNKOWN_VERSION
+# Build
+RUN mvn clean verify -Dlicense.useMissingFile -B
+
+FROM openjdk:11.0.5-jre-slim
 
 RUN \
     apt-get update -y && \
     apt-get remove -y --auto-remove && \
     apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY /target/seldon-engine-${APP_VERSION}.jar app.jar
-COPY /target/generated-resources /licenses/
+COPY --from=builder /workspace/target/seldon-engine-*.jar app.jar
+COPY --from=builder /workspace/target/generated-resources /licenses/
 
 ENTRYPOINT [ "sh", "-c", "java -Djava.security.egd=file:/dev/./urandom $JAVA_OPTS -jar app.jar" ]
 

engine/Makefile

@@ -8,7 +8,7 @@ build_jar: update_proto update_swagger
 	mvn clean verify -Dlicense.useMissingFile -B
 
 build_image: update_proto update_swagger
-	docker build  -f Dockerfile.mvn -t seldonio/$(IMAGE_NAME):$(VERSION) .
+	docker build  -f Dockerfile -t seldonio/$(IMAGE_NAME):$(VERSION) .
 
 push_to_registry:
 	docker push seldonio/$(IMAGE_NAME):$(VERSION)
@@ -31,10 +31,15 @@ start_engine: engine.json
 stop_engine: engine.json
 	kubectl delete --ignore-not-found=true -f engine.json
 
+download_protos_k8s:
+	cd ../proto/k8s ; make create_protos
 
-update_proto:
-	@cp -v ../proto/seldon_deployment.proto src/main/proto/
-	@cp -v ../proto/prediction.proto src/main/proto/
+download_protos_tensorflow:
+	cd ../proto/tensorflow ; make create_protos
+
+update_proto: download_protos_k8s download_protos_tensorflow
+	cp -v ../proto/seldon_deployment.proto src/main/proto/
+	cp -v ../proto/prediction.proto src/main/proto/
 	cp -vr ../proto/k8s/k8s.io src/main/proto
 	cp -vr ../proto/tensorflow/tensorflow src/main/proto
 

jenkins-x.yml

@@ -37,7 +37,7 @@ pipelineConfig:
               command: make
               args:
               - -C engine
-              - -f Makefile.ci
+              - -f Makefile
               - build_jar
           - name: seldon-operator
             steps: