Merge pull request #442 from cliveseldon/openvino_demo_jan19

Update image names for openvino demo
SeldonIO · Feb 11, 2019 · 4d26ff0 · 4d26ff0
2 parents 361db75 + 0b1009e
commit 4d26ff0
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 97 deletions.
diff --git a/examples/models/openvino_imagenet_ensemble/openvino_imagenet_ensemble.ipynb b/examples/models/openvino_imagenet_ensemble/openvino_imagenet_ensemble.ipynb
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/examples/models/openvino_imagenet_ensemble/seldon_ov_predict_ensemble.json b/examples/models/openvino_imagenet_ensemble/seldon_ov_predict_ensemble.json
@@ -17,7 +17,7 @@
             "containers": [
               {
                 "name": "imagenet-itransformer",
-                "image": "seldonio/imagenet_transformer:0.1",
+                "image": "seldonio/openvino-demo-transformer:0.1",
                 "env": [
                   {
                     "name": "TRACING",
@@ -31,7 +31,7 @@
               },
               {
                 "name": "imagenet-otransformer",
-                "image": "seldonio/imagenet_transformer:0.1",
+                "image": "seldonio/openvino-demo-transformer:0.1",
                 "env": [
                   {
                     "name": "TRACING",
@@ -45,7 +45,7 @@
               },
               {
                 "name": "imagenet-combiner",
-                "image": "seldonio/imagenet_combiner:0.1",
+                "image": "seldonio/openvino-demo-combiner:0.1",
                 "env": [
                   {
                     "name": "TRACING",
@@ -59,7 +59,7 @@
               },
               {
                 "name": "prediction1",
-                "image": "seldonio/seldon-openvino-prediction:0.1",
+                "image": "seldonio/openvino-demo-prediction:0.1",
                 "resources": {
                   "requests": {
                     "cpu": "1"
@@ -113,7 +113,7 @@
               },
               {
                 "name": "prediction2",
-                "image": "seldonio/seldon-openvino-prediction:0.1",
+                "image": "seldonio/openvino-demo-prediction:0.1",
                 "resources": {
                   "requests": {
                     "cpu": "1"

diff --git a/examples/models/openvino_imagenet_ensemble/seldon_ovms_ensemble.json b/examples/models/openvino_imagenet_ensemble/seldon_ovms_ensemble.json
@@ -17,7 +17,7 @@
                         "containers": [
                             {
                                 "name": "imagenet-itransformer",				
-                                "image": "seldonio/imagenet_transformer:0.1",
+                                "image": "seldonio/openvino-demo-transformer:0.1",
 				"env": [
 				    {
 					"name": "TRACING",
@@ -31,7 +31,7 @@
                             },
                             {
                                 "name": "imagenet-otransformer",				
-                                "image": "seldonio/imagenet_transformer:0.1",
+                                "image": "seldonio/openvino-demo-transformer:0.1",
 				"env": [
 				    {
 					"name": "TRACING",
@@ -45,7 +45,7 @@
                             },
                             {
                                 "name": "imagenet-combiner",				
-                                "image": "seldonio/imagenet_combiner:0.1",
+                                "image": "seldonio/openvino-demo-combiner:0.1",
 				"env": [
 				    {
 					"name": "TRACING",

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)