From 1930f5d7093e84cdcc9e327e296f4733f32b20c8 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Fri, 25 May 2018 11:30:57 -0400 Subject: Vendor in latest projectatomic/buildah buildah fixed its probelm where it was not pulling in the ENV of the base image. This pulls that change into libpod as well. Signed-off-by: umohnani8 Closes: #832 Approved by: mheon --- vendor/github.com/projectatomic/buildah/util/types.go | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 vendor/github.com/projectatomic/buildah/util/types.go (limited to 'vendor/github.com/projectatomic/buildah/util') diff --git a/vendor/github.com/projectatomic/buildah/util/types.go b/vendor/github.com/projectatomic/buildah/util/types.go new file mode 100644 index 000000000..bce419c02 --- /dev/null +++ b/vendor/github.com/projectatomic/buildah/util/types.go @@ -0,0 +1,10 @@ +package util + +const ( + // DefaultRuntime is the default command to use to run the container. + DefaultRuntime = "runc" + // DefaultCNIPluginPath is the default location of CNI plugin helpers. + DefaultCNIPluginPath = "/usr/libexec/cni:/opt/cni/bin" + // DefaultCNIConfigDir is the default location of CNI configuration files. + DefaultCNIConfigDir = "/etc/cni/net.d" +) -- cgit v1.2.3-54-g00ecf