From 562a23576328c1586f1be968fa15cb075267138c Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Thu, 9 Jan 2014 18:17:50 +0000 Subject: [PATCH] Don't compress the archive made from git's output. Commit 894d4a23fba made BuildFile use TarSum, which doesn't support compressed tar archives. This breaks builds from git url, which compressed it with bzip2. Instead, just pass it uncompressed. Docker-DCO-1.0-Signed-off-by: Paul Lietar (github: plietar) --- AUTHORS | 1 + api.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 1ff9b8db02..35cfc687bd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -148,6 +148,7 @@ odk- Pascal Borreli Paul Bowsher Paul Hammond +Paul LiƩtar Paul Nasrat Phil Spitler Piotr Bogdan diff --git a/api.go b/api.go index 972abbf716..9fe9bc716a 100644 --- a/api.go +++ b/api.go @@ -929,7 +929,7 @@ func postBuild(srv *Server, version float64, w http.ResponseWriter, r *http.Requ return fmt.Errorf("Error trying to use git: %s (%s)", err, output) } - c, err := archive.Tar(root, archive.Bzip2) + c, err := archive.Tar(root, archive.Uncompressed) if err != nil { return err }