Merge pull request #1635 from porter-dev/belanger/fix-registry-deploy

Prevent builds on deployments to a registry

cli/cmd/apply.go

@@ -414,40 +414,43 @@ func (d *Driver) updateApplication(resource *models.Resource, client *api.Client
 		return nil, err
 	}
 
-	buildEnv, err := updateAgent.GetBuildEnv(&deploy.GetBuildEnvOpts{
-		UseNewConfig: true,
-		NewConfig:    appConf.Values,
-	})
+	// if the build method is registry, we do not trigger a build
+	if appConf.Build.Method != "registry" {
+		buildEnv, err := updateAgent.GetBuildEnv(&deploy.GetBuildEnvOpts{
+			UseNewConfig: true,
+			NewConfig:    appConf.Values,
+		})
 
-	if err != nil {
-		return nil, err
-	}
+		if err != nil {
+			return nil, err
+		}
 
-	err = updateAgent.SetBuildEnv(buildEnv)
+		err = updateAgent.SetBuildEnv(buildEnv)
 
-	if err != nil {
-		return nil, err
-	}
+		if err != nil {
+			return nil, err
+		}
 
-	var buildConfig *types.BuildConfig
+		var buildConfig *types.BuildConfig
 
-	if appConf.Build.Builder != "" {
-		buildConfig = &types.BuildConfig{
-			Builder:    appConf.Build.Builder,
-			Buildpacks: appConf.Build.Buildpacks,
+		if appConf.Build.Builder != "" {
+			buildConfig = &types.BuildConfig{
+				Builder:    appConf.Build.Builder,
+				Buildpacks: appConf.Build.Buildpacks,
+			}
 		}
-	}
 
-	err = updateAgent.Build(buildConfig)
+		err = updateAgent.Build(buildConfig)
 
-	if err != nil {
-		return nil, err
-	}
+		if err != nil {
+			return nil, err
+		}
 
-	err = updateAgent.Push()
+		err = updateAgent.Push()
 
-	if err != nil {
-		return nil, err
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	err = updateAgent.UpdateImageAndValues(appConf.Values)