Skip to content

Commit

Permalink
Makefile: Push "latest" to flannel-git on quay.io
Browse files Browse the repository at this point in the history
  • Loading branch information
tomdee committed Aug 31, 2016
1 parent e813a6d commit 68664ac
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
21 changes: 12 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
language: go
sudo: required

services:
- docker

matrix:
include:
- go: 1.5.4
env: GO15VENDOREXPERIMENT=1
- go: 1.6.2
- go: tip
allow_failures:
- go: tip
language: go

env:
global:
Expand All @@ -20,5 +16,12 @@ install:
script:
- make test

after_success:
- if [ "$TRAVIS_BRANCH" = "master" ]; then
make flannel-git;
docker login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io;
docker push quay.io/coreos/flannel-git;
fi

notifications:
email: false
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: test e2e-test cover gofmt gofmt-fix license-check clean tar.gz docker-push release docker-push-all
.PHONY: test e2e-test cover gofmt gofmt-fix license-check clean tar.gz docker-push release docker-push-all flannel-git

# Registry used for publishing images
REGISTRY?=quay.io/coreos
Expand Down Expand Up @@ -156,3 +156,6 @@ docker-push-all:
ARCH=arm make docker-push
ARCH=arm64 make docker-push
ARCH=ppc64le make docker-push

flannel-git: dist/flanneld-amd64 dist/iptables-amd64 dist/libpthread.so.0-amd64
docker build -f Dockerfile.amd64 -t quay.io/coreos/flannel-git .

0 comments on commit 68664ac

Please sign in to comment.