diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-13 18:06:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 18:06:54 +0100 |
| commit | eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509 (patch) | |
| tree | 4666b0a66a98bd3f29586b3d3ac2c3028bd7443a /cmd/podman/images | |
| parent | ab7228b3c27719e447de4dffe9b3fd7f67d6f346 (diff) | |
| parent | ece768ff9e7d2b0166c0b1850467a489556b93fc (diff) | |
| download | podman-eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509.tar.gz podman-eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509.tar.bz2 podman-eeb76db0fd0dc2a1115c2f2ad12c82eadbc62509.zip | |
Merge pull request #12642 from Luap99/libnetwork
use libnetwork from c/common
Diffstat (limited to 'cmd/podman/images')
| -rw-r--r-- | cmd/podman/images/build.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 751db099f..606c18aae 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -514,11 +514,10 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil opts := buildahDefine.BuildOptions{ AddCapabilities: flags.CapAdd, AdditionalTags: tags, + AllPlatforms: flags.AllPlatforms, Annotations: flags.Annotation, Args: args, BlobDirectory: flags.BlobCache, - CNIConfigDir: flags.CNIConfigDir, - CNIPluginPath: flags.CNIPlugInPath, CommonBuildOpts: commonOpts, Compression: compression, ConfigureNetwork: networkPolicy, @@ -559,6 +558,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil SystemContext: systemContext, Target: flags.Target, TransientMounts: flags.Volumes, + UnsetEnvs: flags.UnsetEnvs, } if flags.IgnoreFile != "" { |