From 4c4bf2ea4a067d7a2875efc6da03cd5a368e0319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Pab=C3=B3n?= <luis@portworx.com>
Date: Wed, 14 Mar 2018 11:32:57 -0400
Subject: [PATCH] Fix travis build

Also, changes the tag to be `canary` not `0.2.0`. Named
tags can be done by hand once we pick a release.
---
 .travis.yml             |  2 +-
 Makefile                |  4 ++--
 hack/build-container.sh | 13 -------------
 3 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100755 hack/build-container.sh

diff --git a/.travis.yml b/.travis.yml
index e536ee5983..91b1ef2362 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ script:
 - go test $(go list ./... | grep -v vendor)
 after_success:
   - if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-      sudo ./hack/build-container.sh;
+      make container
       docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" quay.io;
       docker push quay.io/k8scsi/csi-provisioner:canary;
     fi
diff --git a/Makefile b/Makefile
index 62f0acc566..a7df648363 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 IMAGE_NAME = quay.io/k8scsi/csi-provisioner
-IMAGE_VERSION = v0.2.0
+IMAGE_VERSION = canary
 
 ifdef V
 TESTARGS = -v -args -alsologtostderr -v 5
@@ -25,7 +25,7 @@ all: csi-provisioner
 
 csi-provisioner:
 	mkdir -p bin
-	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o ./bin/csi-provisioner ./cmd/csi-provisioner 
+	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o ./bin/csi-provisioner ./cmd/csi-provisioner
 
 clean:
 	rm -rf bin deploy/docker/csi-provisioner
diff --git a/hack/build-container.sh b/hack/build-container.sh
deleted file mode 100755
index 00631a2d09..0000000000
--- a/hack/build-container.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-NAME=csi-provisioner
-TAG=canary
-CONTAINER=quay.io/k8scsi/${NAME}:${TAG}
-APP=csi-provisioner
-
-docker build --rm -f Dockerfile.builder -t ${NAME}:builder .
-docker run --rm --privileged -v $PWD:/host ${NAME}:builder cp /go/bin/${APP} /host/${APP}
-sudo chown $USER ${APP}
-docker build --rm -t ${CONTAINER} .
-docker rmi ${NAME}:builder
-rm -f ${APP}