From 9ce18849254b29111bfe08bf844e35122b0854e4 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 6 Oct 2015 20:50:40 -0400
Subject: [PATCH] Add upload to bintray from travis.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 .pre-commit-config.yaml                |  1 +
 .travis.yml                            | 10 +++++++++
 script/build-image                     |  1 -
 script/build-linux                     |  2 +-
 script/travis/bintray.json.tmpl        | 29 ++++++++++++++++++++++++++
 script/travis/build-binary             |  6 ++++--
 script/travis/render-bintray-config.py |  9 ++++++++
 7 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 script/travis/bintray.json.tmpl
 create mode 100755 script/travis/render-bintray-config.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8913a05f..3fad8ddc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,6 +5,7 @@
     - id: check-docstring-first
     - id: check-merge-conflict
     - id: check-yaml
+    - id: check-json
     - id: debug-statements
     - id: end-of-file-fixer
     - id: flake8
diff --git a/.travis.yml b/.travis.yml
index 0f966f9d..3310e2ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,3 +17,13 @@ install: ./script/travis/install
 script:
   - ./script/travis/ci
   - ./script/travis/build-binary
+
+before_deploy:
+  - "./script/travis/render-bintray-config.py < ./script/travis/bintray.json.tmpl > ./bintray.json"
+
+deploy:
+  provider: bintray
+  user: docker-compose-roleuser
+  key: '$BINTRAY_API_KEY'
+  file: ./bintray.json
+  skip_cleanup: true
diff --git a/script/build-image b/script/build-image
index d9faddc7..3ac9729b 100755
--- a/script/build-image
+++ b/script/build-image
@@ -13,4 +13,3 @@ VERSION="$(python setup.py --version)"
 python setup.py sdist
 cp dist/docker-compose-$VERSION.tar.gz dist/docker-compose-release.tar.gz
 docker build -t docker/compose:$TAG -f Dockerfile.run .
-
diff --git a/script/build-linux b/script/build-linux
index 4b869621..ade18bc5 100755
--- a/script/build-linux
+++ b/script/build-linux
@@ -5,7 +5,7 @@ set -ex
 ./script/clean
 
 TAG="docker-compose"
-docker build -t "$TAG" .
+docker build -t "$TAG" . | tail -n 200
 docker run \
     --rm --entrypoint="script/build-linux-inner" \
     -v $(pwd)/dist:/code/dist \
diff --git a/script/travis/bintray.json.tmpl b/script/travis/bintray.json.tmpl
new file mode 100644
index 00000000..7d0adbeb
--- /dev/null
+++ b/script/travis/bintray.json.tmpl
@@ -0,0 +1,29 @@
+{
+    "package": {
+        "name": "${TRAVIS_OS_NAME}",
+        "repo": "master",
+        "subject": "docker-compose",
+        "desc": "Automated build of master branch from travis ci.",
+        "website_url": "https://github.com/docker/compose",
+        "issue_tracker_url": "https://github.com/docker/compose/issues",
+        "vcs_url": "https://github.com/docker/compose.git",
+        "licenses": ["Apache-2.0"]
+    },
+
+    "version": {
+        "name": "master",
+        "desc": "Automated build of the master branch.",
+        "released": "${DATE}",
+        "vcs_tag": "master"
+    },
+
+    "files": [
+        {
+            "includePattern": "dist/(.*)",
+            "excludePattern": ".*\.tar.gz",
+            "uploadPattern": "$1",
+            "matrixParams": { "override": 1 }
+        }
+    ],
+    "publish": true
+}
diff --git a/script/travis/build-binary b/script/travis/build-binary
index b3b7b925..0becee7f 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     script/build-linux
-    # TODO: add script/build-image
+    script/build-image master
+    # TODO: requires auth
+    # docker push docker/compose:master
 else
     script/prepare-osx
     script/build-osx
diff --git a/script/travis/render-bintray-config.py b/script/travis/render-bintray-config.py
new file mode 100755
index 00000000..6aa468d6
--- /dev/null
+++ b/script/travis/render-bintray-config.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import datetime
+import os.path
+import sys
+
+os.environ['DATE'] = str(datetime.date.today())
+
+for line in sys.stdin:
+    print os.path.expandvars(line),