feat(deploy.sh): push deisci/workflow:v2-alpha images from master

This is the minimal amount of automation necessary to get a Deis
v2 component up for testing.

Author: mboersma

.travis.yml

@@ -34,11 +34,8 @@ install:
 script:
   - make test
   - make -C client/ test
-before_deploy:
-  - BUILD_TAG=latest IMAGE_PREFIX=deis/ make build
 deploy:
   provider: script
   script: _scripts/ci/deploy.sh
   on:
     branch: master
-    condition: ${TRAVIS_PULL_REQUEST} == false

Makefile

@@ -1,11 +1,10 @@
-ifndef BUILD_TAG
-  BUILD_TAG = git-$(shell git rev-parse --short HEAD)
-endif
-
-COMPONENT=workflow
-IMAGE_PREFIX ?= $(DEV_REGISTRY)/deis/
-IMAGE=$(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-SHELL_SCRIPTS=$(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh')
+
+REGISTRY ?= $(DEV_REGISTRY)
+IMAGE_PREFIX ?= deis
+COMPONENT ?= workflow
+BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
+IMAGE = $(REGISTRY)/$(IMAGE_PREFIX)/$(COMPONENT):$(BUILD_TAG)
+SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(shell find "_scripts/ci" -name '*.sh')
 
 check-docker:
 	@if [ -z $$(which docker) ]; then \

_scripts/ci/deploy.sh

@@ -1,7 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# Build and push Docker images to Docker Hub and quay.io.
+#
 
-docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-docker push deis/workflow:latest
-docker tag deis/workflow:latest quay.io/deis/workflow:latest
+cd "$(dirname "$0")"
+
+docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" docker.io
+REGISTRY=docker.io IMAGE_PREFIX=deisci BUILD_TAG=v2-alpha make -C ../.. docker-build docker-push
 docker login -e="$QUAY_EMAIL" -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io
-docker push quay.io/deis/workflow:latest
+REGISTRY=quay.io IMAGE_PREFIX=deisci BUILD_TAG=v2-alpha make -C ../.. docker-build docker-push

manifests/deis-workflow-rc.yml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: deis-workflow
-          image: deis/workflow:latest
+          image: quay.io/deisci/workflow:v2-alpha
           env:
             - name: DEBUG
               value: "true"