diff options
| author | umohnani8 <umohnani@redhat.com> | 2018-05-25 11:30:57 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-25 17:03:09 +0000 |
| commit | 1930f5d7093e84cdcc9e327e296f4733f32b20c8 (patch) | |
| tree | 4c41a5e955b12881dc7a88dae573a36dea9982ba /vendor/github.com/projectatomic/buildah/util | |
| parent | 8fcf1aaa29e61b9305096f61a8ba26bc81462b05 (diff) | |
| download | podman-1930f5d7093e84cdcc9e327e296f4733f32b20c8.tar.gz podman-1930f5d7093e84cdcc9e327e296f4733f32b20c8.tar.bz2 podman-1930f5d7093e84cdcc9e327e296f4733f32b20c8.zip | |
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 <umohnani@redhat.com>
Closes: #832
Approved by: mheon
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/util')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/util/types.go | 10 |
1 files changed, 10 insertions, 0 deletions
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" +) |