[camel-k] 05/15: fix(buildah): Fix Docker config pre-processing

[astefanutti]

This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 68960455c4ccc41d5bef6fbb9e5331d0458f36ef
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Mon Feb 24 17:20:38 2020 +0100

    fix(buildah): Fix Docker config pre-processing
---
 pkg/trait/builder.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 72919c8..4d9214a 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -211,8 +211,6 @@ func (t *builderTrait) builderTask(e *Environment) 
*v1.BuilderTask {
 func (t *builderTrait) buildahTask(e *Environment) (*v1.ImageTask, error) {
        image := getImageName(e)
 
-       auth := []string{""}
-
        bud := []string{
                "buildah",
                "bud",
@@ -254,6 +252,7 @@ func (t *builderTrait) buildahTask(e *Environment) 
(*v1.ImageTask, error) {
                push = append(push[:2], 
append([]string{"--cert-dir=/etc/containers/certs.d"}, push[2:]...)...)
        }
 
+       var auth string
        if e.Platform.Status.Build.Registry.Secret != "" {
                secret, err := getRegistrySecretFor(e, buildahRegistrySecrets)
                if err != nil {
@@ -261,9 +260,7 @@ func (t *builderTrait) buildahTask(e *Environment) 
(*v1.ImageTask, error) {
                }
                if secret == plainDockerBuildahRegistrySecret {
                        // Handle old format and make it compatible with Buildah
-                       auth = []string{
-                               "(echo '{ \"auths\": ' ; cat 
/buildah/.docker/config.json ; echo \"}\") > /tmp/.dockercfg",
-                       }
+                       auth = "(echo '{ \"auths\": ' ; cat 
/buildah/.docker/config.json ; echo \"}\") > /tmp/.dockercfg"
                        env = append(env, corev1.EnvVar{
                                Name:  "REGISTRY_AUTH_FILE",
                                Value: "/tmp/.dockercfg",
@@ -278,10 +275,12 @@ func (t *builderTrait) buildahTask(e *Environment) 
(*v1.ImageTask, error) {
        env = append(env, proxySecretEnvVars(e)...)
 
        args := []string{
-               strings.Join(auth, " "),
                strings.Join(bud, " "),
                strings.Join(push, " "),
        }
+       if auth != "" {
+               args = append([]string{auth}, args...)
+       }
 
        return &v1.ImageTask{
                ContainerTask: v1.ContainerTask{