summaryrefslogtreecommitdiff
path: root/vendor/github.com/projectatomic/buildah/buildah.go
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2018-06-19 10:03:34 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-22 14:55:32 +0000
commit89af35175d97cf90e7336d3c817612fafc68dbdb (patch)
tree7468b588dfc47b0e9f173c6b273c732514eb6821 /vendor/github.com/projectatomic/buildah/buildah.go
parent82a948c04ec068acb9f0d47dc0f9e3bd05b4c90c (diff)
downloadpodman-89af35175d97cf90e7336d3c817612fafc68dbdb.tar.gz
podman-89af35175d97cf90e7336d3c817612fafc68dbdb.tar.bz2
podman-89af35175d97cf90e7336d3c817612fafc68dbdb.zip
Add cap-add and cap-drop to build man page
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Closes: #968 Approved by: mheon
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/buildah.go')
-rw-r--r--vendor/github.com/projectatomic/buildah/buildah.go16
1 files changed, 15 insertions, 1 deletions
diff --git a/vendor/github.com/projectatomic/buildah/buildah.go b/vendor/github.com/projectatomic/buildah/buildah.go
index 5d241564c..5fb428da2 100644
--- a/vendor/github.com/projectatomic/buildah/buildah.go
+++ b/vendor/github.com/projectatomic/buildah/buildah.go
@@ -163,6 +163,13 @@ type Builder struct {
CNIConfigDir string
// ID mapping options to use when running processes in the container with non-host user namespaces.
IDMappingOptions IDMappingOptions
+ // AddCapabilities is a list of capabilities to add to the default set when running
+ // commands in the container.
+ AddCapabilities []string
+ // DropCapabilities is a list of capabilities to remove from the default set,
+ // after processing the AddCapabilities set, when running commands in the container.
+ // If a capability appears in both lists, it will be dropped.
+ DropCapabilities []string
CommonBuildOpts *CommonBuildOptions
// TopLayer is the top layer of the image
@@ -221,7 +228,7 @@ func GetBuildInfo(b *Builder) BuilderInfo {
// CommonBuildOptions are resources that can be defined by flags for both buildah from and build-using-dockerfile
type CommonBuildOptions struct {
- // AddHost is the list of hostnames to add to the resolv.conf
+ // AddHost is the list of hostnames to add to the build container's /etc/hosts.
AddHost []string
// CgroupParent is the path to cgroups under which the cgroup for the container will be created.
CgroupParent string
@@ -327,6 +334,13 @@ type BuilderOptions struct {
CNIConfigDir string
// ID mapping options to use if we're setting up our own user namespace.
IDMappingOptions *IDMappingOptions
+ // AddCapabilities is a list of capabilities to add to the default set when
+ // running commands in the container.
+ AddCapabilities []string
+ // DropCapabilities is a list of capabilities to remove from the default set,
+ // after processing the AddCapabilities set, when running commands in the
+ // container. If a capability appears in both lists, it will be dropped.
+ DropCapabilities []string
CommonBuildOpts *CommonBuildOptions
}