Skip to content

Commit

Permalink
use newer docker and login format
Browse files Browse the repository at this point in the history
  • Loading branch information
ddollar committed Jan 29, 2016
1 parent 65cdf2f commit a78d11b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM gliderlabs/alpine:3.2
FROM gliderlabs/alpine:3.3

RUN apk-install docker git go haproxy python

Expand Down
10 changes: 7 additions & 3 deletions api/cmd/build/main.go
Expand Up @@ -82,10 +82,14 @@ func main() {
die(err)
}

cfg := []byte(*dockercfg)
if *dockercfg != "" {
err := os.MkdirAll("/root/.docker", 0700)

if len(cfg) > 0 {
err = ioutil.WriteFile("/root/.dockercfg", cfg, 0400)
if err != nil {
die(err)
}

err = ioutil.WriteFile("/root/.docker/config.json", []byte(*dockercfg), 0400)

if err != nil {
die(err)
Expand Down
2 changes: 1 addition & 1 deletion api/models/build.go
Expand Up @@ -244,7 +244,7 @@ func (b *Build) buildArgs(cache bool, config string) ([]string, error) {
args = append(args, "-no-cache")
}

if dockercfg, err := ioutil.ReadFile("/root/.dockercfg"); err == nil {
if dockercfg, err := ioutil.ReadFile("/root/.docker/config.json"); err == nil {
args = append(args, "-dockercfg", string(dockercfg))
}

Expand Down

0 comments on commit a78d11b

Please sign in to comment.