Merge pull request #234 from astronomer/reimplement-docker-push

bump docker version
astronomer · Jun 17, 2019 · 6fad460 · 6fad460
2 parents de76a6f + 7f4bcbd
commit 6fad460
Show file tree

Hide file tree

Showing 498 changed files with 35,977 additions and 13,836 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -4,31 +4,36 @@
 
 [[constraint]]
   name = "github.com/spf13/cobra"
-  version = "0.0.1"
+  version = "0.0.5"
 
 [[constraint]]
   name = "github.com/spf13/viper"
   revision = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"
 
+[[override]]
+  name = "github.com/spf13/pflag"
+  version = "1.0.3"
+
 [[constraint]]
   branch = "master"
   name = "github.com/iancoleman/strcase"
 
 [[constraint]]
   name = "github.com/docker/libcompose"
-  revision = "57bd716502dcbe1799f026148016022b0f3b989c"
+  revision = "213509acef0fe8f2358f4c0bb977eb3f4889ea15"
 
 [[override]]
   name = "github.com/docker/docker"
-  revision = "a68ae4a2d95b1ff143025a435195af0f1ab30ace"
+  source = "https://github.com/docker/engine.git"
+  revision = "200b524eff60a9c95a22bc2518042ac2ff617d07" # 18.09 branch
 
 [[override]]
   name = "github.com/docker/distribution"
   revision = "6664ec703991875e14419ff4960921cce7678bab"
 
 [[override]]
   name = "github.com/docker/cli"
-  revision = "ef7d8be86c96f48cd05ae692b4ad1c18aaac6940"
+  revision = "v18.09.6"
 
 [[override]]
   name = "github.com/docker/go-metrics"

diff --git a/airflow/docker.go b/airflow/docker.go
@@ -583,7 +583,7 @@ func Deploy(path, name, wsId string, prompt bool) error {
 
 	// Push image to registry
 	fmt.Println(messages.COMPOSE_PUSHING_IMAGE_PROMPT)
-	err = docker.Exec("push", remoteImage)
+	err = docker.ExecPush(registry, c.Token, remoteImage)
 	if err != nil {
 		return errors.Wrapf(err, "command 'docker push %s' failed", remoteImage)
 	}