merge from master

SeldonIO · Feb 12, 2019 · 853ef20 · 853ef20
2 parents fb4da66 + 4d26ff0
commit 853ef20
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/examples/models/openvino_imagenet_ensemble/resources/combiner/Makefile b/examples/models/openvino_imagenet_ensemble/resources/combiner/Makefile
@@ -1,4 +1,9 @@
+IMAGE_VERSION=0.1
+IMAGE_NAME=docker.io/seldonio/openvino-demo-combiner
 
 build:
-	s2i build -E environment_grpc . seldon_openvino_base:latest seldonio/imagenet_combiner:0.1
+	s2i build -E environment_grpc . seldonio/seldon-core-s2i-openvino:0.1 $(IMAGE_NAME):$(IMAGE_VERSION)
+
+push_to_dockerhub:
+	docker push $(IMAGE_NAME):$(IMAGE_VERSION)
 
diff --git a/examples/models/openvino_imagenet_ensemble/resources/model/Makefile b/examples/models/openvino_imagenet_ensemble/resources/model/Makefile
@@ -0,0 +1,8 @@
+IMAGE_VERSION=0.1
+IMAGE_NAME=docker.io/seldonio/openvino-demo-prediction
+
+build:
+	s2i build -E environment_grpc . seldonio/seldon-core-s2i-openvino:0.1 $(IMAGE_NAME):$(IMAGE_VERSION)
+
+push_to_dockerhub:
+	docker push $(IMAGE_NAME):$(IMAGE_VERSION)
diff --git a/examples/models/openvino_imagenet_ensemble/resources/transformer/Makefile b/examples/models/openvino_imagenet_ensemble/resources/transformer/Makefile
@@ -1,3 +1,8 @@
+IMAGE_VERSION=0.1
+IMAGE_NAME=docker.io/seldonio/openvino-demo-transformer
 
 build:
-	s2i build -E environment_grpc . seldon_openvino_base:latest seldonio/imagenet_transformer:0.1
+	s2i build -E environment_grpc . seldonio/seldon-core-s2i-openvino:0.1 $(IMAGE_NAME):$(IMAGE_VERSION)
+
+push_to_dockerhub:
+	docker push $(IMAGE_NAME):$(IMAGE_VERSION)
diff --git a/wrappers/s2i/python_openvino/Makefile b/wrappers/s2i/python_openvino/Makefile
@@ -9,7 +9,6 @@ s2i:
 .PHONY: build
 build: s2i
 	docker build -f Dockerfile_openvino_base -t $(IMAGE_NAME):$(IMAGE_VERSION) .
-	#docker build -f Dockerfile_openvino_base --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy -t $(IMAGE_NAME):$(IMAGE_VERSION) .
 
 push_to_dockerhub:
 	docker push $(IMAGE_NAME):$(IMAGE_VERSION)