summaryrefslogtreecommitdiff
path: root/pkg/bindings
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-03-08 10:07:54 -0500
committerGitHub <noreply@github.com>2021-03-08 10:07:54 -0500
commitb6079bcf4af26c9e0f9c0438d8aabd3ed78f7914 (patch)
tree122f2480b9f9bc43709d077f1f8f8b78ed271c23 /pkg/bindings
parentbbb9d9b0781b06e189406cee95a64a415f9ed577 (diff)
parent9e75cafd5cd9b530d8fadb0a25b9c99836d80e40 (diff)
downloadpodman-b6079bcf4af26c9e0f9c0438d8aabd3ed78f7914.tar.gz
podman-b6079bcf4af26c9e0f9c0438d8aabd3ed78f7914.tar.bz2
podman-b6079bcf4af26c9e0f9c0438d8aabd3ed78f7914.zip
Merge pull request #9592 from rhatdan/timestamp
Numerous buildah fixes found by Ed's testing of buildah tests against podman.
Diffstat (limited to 'pkg/bindings')
-rw-r--r--pkg/bindings/images/build.go22
1 files changed, 22 insertions, 0 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 27706fd2c..1cbd28c37 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -87,6 +87,28 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
params.Add("devices", d)
}
+ if dnsservers := options.CommonBuildOpts.DNSServers; len(dnsservers) > 0 {
+ c, err := jsoniter.MarshalToString(dnsservers)
+ if err != nil {
+ return nil, err
+ }
+ params.Add("dnsservers", c)
+ }
+ if dnsoptions := options.CommonBuildOpts.DNSOptions; len(dnsoptions) > 0 {
+ c, err := jsoniter.MarshalToString(dnsoptions)
+ if err != nil {
+ return nil, err
+ }
+ params.Add("dnsoptions", c)
+ }
+ if dnssearch := options.CommonBuildOpts.DNSSearch; len(dnssearch) > 0 {
+ c, err := jsoniter.MarshalToString(dnssearch)
+ if err != nil {
+ return nil, err
+ }
+ params.Add("dnssearch", c)
+ }
+
if caps := options.DropCapabilities; len(caps) > 0 {
c, err := jsoniter.MarshalToString(caps)
if err != nil {