diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-26 10:13:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 10:13:56 +0100 |
| commit | 79565d1af18f07754e067b7203f42122d8fc03a9 (patch) | |
| tree | c0869382db971ef17d8942b7dee5f51aee754dca /cmd | |
| parent | 6ba8819d336ed3514b57c5818123ddfac80555ef (diff) | |
| parent | 97f5e9458c8d618989e5ff386620bfee35942df3 (diff) | |
| download | podman-79565d1af18f07754e067b7203f42122d8fc03a9.tar.gz podman-79565d1af18f07754e067b7203f42122d8fc03a9.tar.bz2 podman-79565d1af18f07754e067b7203f42122d8fc03a9.zip | |
Merge pull request #9094 from rhatdan/mount
Pass DefaultMountsFile to podman build
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/images/build.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 1029e03d1..4219e325b 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -423,10 +423,10 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil Ulimit: flags.Ulimit, Volumes: flags.Volumes, }, - Compression: compression, - ConfigureNetwork: networkPolicy, - ContextDirectory: contextDir, - // DefaultMountsFilePath: FIXME: this requires global flags to be working! + Compression: compression, + ConfigureNetwork: networkPolicy, + ContextDirectory: contextDir, + DefaultMountsFilePath: containerConfig.Containers.DefaultMountsFile, Devices: flags.Devices, DropCapabilities: flags.CapDrop, Err: stderr, |