Add make publish to allow easy docker publishing

By setting `docker_prefix` in `hack/config.sh` a private repository can be selected. Default is "kubevirt". By setting `docker_tag` a release tag can be specified. Default is "latest". Change-Id: Ie39ab72140142784452610f96e4f9e7184c3a464 Signed-off-by: Roman Mohr <[email protected]>
sahid · Oct 17, 2016 · 32ddbd0 · 32ddbd0
1 parent 12b51d8
commit 32ddbd0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,10 @@ sync:
 docker: build
 	./hack/build-docker.sh build ${WHAT}
 
+publish: docker
+	./hack/build-docker.sh push ${WHAT}
+
 contrib:
 	./hack/build-contrib.sh
 
-.PHONY: build fmt test clean distclean sync docker contrib vet
+.PHONY: build fmt test clean distclean sync docker contrib vet publish
diff --git a/contrib/manifest/virt-controller.yaml.in b/contrib/manifest/virt-controller.yaml.in
@@ -7,22 +7,24 @@ metadata:
 spec:
   containers:
   - name: virt-controller
-    image: {{ docker_prefix }}/virt-controller
+    image: {{ docker_prefix }}/virt-controller:{{ docker_tag }}
     imagePullPolicy: IfNotPresent
     command:
         - "/virt-controller"
         - "--api-server"
         - "127.0.0.1:8001"
         - "--docker-registry"
         - "{{ docker_prefix }}"
+        - "--launcher-image"
+        - "virt-launcher:{{ docker_tag }}"
         - "--port"
         - "8182"
     ports:
       - containerPort: 8182
         name: "virt-controller"
         protocol: "TCP"
   - name: kubectl
-    image: {{ docker_prefix }}/virt-controller
+    image: {{ docker_prefix }}/virt-controller:{{ docker_tag }}
     imagePullPolicy: IfNotPresent
     command:
         - "kubectl"

diff --git a/hack/build-docker.sh b/hack/build-docker.sh
@@ -17,5 +17,9 @@ else
 fi
 
 for arg in $args; do
-    (cd $arg; docker $target -t ${docker_prefix}/$(basename $arg) .)
+    if [ "${target}" = "build" ]; then
+        (cd $arg; docker $target -t ${docker_prefix}/$(basename $arg):${docker_tag} .)
+    elif [ "${target}" = "push" ]; then
+        (cd $arg; docker $target ${docker_prefix}/$(basename $arg):${docker_tag})
+    fi
 done
diff --git a/hack/config.sh b/hack/config.sh
@@ -2,4 +2,5 @@
 
 binaries="cmd/virt-controller cmd/virt-launcher"
 docker_prefix=kubevirt
+docker_tag=latest
 manifest_templates="`ls contrib/manifest/*.in`"