Build http proxy image in release workflow (#386)

* make release workflow also build http proxy for tf serving * cp build image script to http proxy
kubeflow · Mar 8, 2018 · 33299ff · 33299ff
1 parent fbc05b4
commit 33299ff
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/components/k8s-model-server/http-proxy/build_image.sh b/components/k8s-model-server/http-proxy/build_image.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# A simple script to build the Docker images.
+# This is intended to be invoked as a step in Argo to build the docker image.
+#
+# build_image.sh ${DOCKERFILE} ${IMAGE}
+set -ex
+
+DOCKERFILE=$1
+CONTEXT_DIR=$(dirname "$DOCKERFILE")
+IMAGE=$2
+
+# Wait for the Docker daemon to be available.
+until docker ps
+do sleep 3
+done
+
+docker build --pull -t ${IMAGE} \
+	-f ${DOCKERFILE} ${CONTEXT_DIR}
+
+gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}
+gcloud docker -- push ${IMAGE}
diff --git a/releasing/releaser/components/workflows.libsonnet b/releasing/releaser/components/workflows.libsonnet
@@ -84,6 +84,9 @@
       local cpuImage = params.registry + "/tf-model-server-cpu" + ":" + params.versionTag;
       local gpuImage = params.registry + "/tf-model-server-gpu" + ":" + params.versionTag;
 
+      local httpImageDir = srcRootDir + "/kubeflow/kubeflow/components/k8s-model-server/http-proxy";
+      local httpProxyImage = params.registry + "/tf-model-server-http-proxy:" + params.versionTag;
+
       // Build an Argo template to execute a particular command.
       // step_name: Name for the template
       // command: List to pass as the container command.
@@ -131,7 +134,7 @@
       };  // buildTemplate
 
 
-      local buildImageTemplate(step_name, dockerfile, image) =
+      local buildImageTemplate(step_name, imageDir, dockerfile, image) =
         buildTemplate(
           step_name,
           [
@@ -211,6 +214,11 @@
                     template: "build-tf-serving-gpu",
                     dependencies: ["checkout"],
                   },
+                  {
+                    name: "build-tf-serving-http",
+                    template: "build-tf-serving-http",
+                    dependencies: ["checkout"],
+                  },
                   {
                     name: "create-pr-symlink",
                     template: "create-pr-symlink",
@@ -257,8 +265,9 @@
               },
             },  // checkout
 
-            buildImageTemplate("build-tf-serving-cpu", "Dockerfile.cpu", cpuImage),
-            buildImageTemplate("build-tf-serving-gpu", "Dockerfile.gpu", gpuImage),
+            buildImageTemplate("build-tf-serving-cpu", imageDir, "Dockerfile.cpu", cpuImage),
+            buildImageTemplate("build-tf-serving-gpu", imageDir, "Dockerfile.gpu", gpuImage),
+            buildImageTemplate("build-tf-serving-http", httpImageDir, "Dockerfile", httpProxyImage),
 
             buildTemplate(
               "deploy-tf-serving",