summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-09 21:09:50 +0200
committerGitHub <noreply@github.com>2019-08-09 21:09:50 +0200
commit492b4f65f66fbe061177af48928be10cc59f10ad (patch)
tree5662ddb70b7cdd5d64768823e77ef97029b4bce2 /cmd/podman
parent4b91f60e893d2f0cdc4c410b4693a22efc1d48f4 (diff)
parentcfdf891552704dce8020aa313f61bf85f5a6b072 (diff)
downloadpodman-492b4f65f66fbe061177af48928be10cc59f10ad.tar.gz
podman-492b4f65f66fbe061177af48928be10cc59f10ad.tar.bz2
podman-492b4f65f66fbe061177af48928be10cc59f10ad.zip
Merge pull request #3737 from QiWang19/create_auth
fix create&run getting --authfile from cli
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/shared/create.go2
-rw-r--r--cmd/podman/shared/intermediate.go1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 24279b871..84cba4b75 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -83,7 +83,7 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.
} else {
return nil, nil, errors.Errorf("error, no input arguments were provided")
}
- newImage, err := runtime.ImageRuntime().New(ctx, name, rtc.SignaturePolicyPath, GetAuthFile(""), writer, nil, image.SigningOptions{}, false, nil)
+ newImage, err := runtime.ImageRuntime().New(ctx, name, rtc.SignaturePolicyPath, GetAuthFile(c.String("authfile")), writer, nil, image.SigningOptions{}, false, nil)
if err != nil {
return nil, nil, err
}
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go
index 4062ac48a..3479876b4 100644
--- a/cmd/podman/shared/intermediate.go
+++ b/cmd/podman/shared/intermediate.go
@@ -366,6 +366,7 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["add-host"] = newCRStringSlice(c, "add-host")
m["annotation"] = newCRStringSlice(c, "annotation")
m["attach"] = newCRStringSlice(c, "attach")
+ m["authfile"] = newCRString(c, "authfile")
m["blkio-weight"] = newCRString(c, "blkio-weight")
m["blkio-weight-device"] = newCRStringSlice(c, "blkio-weight-device")
m["cap-add"] = newCRStringSlice(c, "cap-add")