vendor in selinux and buildah for darwin compilation

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1037
Approved by: baude
This commit is contained in:
baude
2018-07-02 10:25:18 -05:00
committed by Atomic Bot
parent d357703e06
commit 767b3ddc43
10 changed files with 48 additions and 14 deletions

View File

@ -49,7 +49,7 @@ github.com/opencontainers/image-spec v1.0.0
github.com/opencontainers/runc 6e15bc3f92fd4c58b3285e8f27eaeb6b22d62920 github.com/opencontainers/runc 6e15bc3f92fd4c58b3285e8f27eaeb6b22d62920
github.com/opencontainers/runtime-spec v1.0.0 github.com/opencontainers/runtime-spec v1.0.0
github.com/opencontainers/runtime-tools 625e2322645b151a7cbb93a8b42920933e72167f github.com/opencontainers/runtime-tools 625e2322645b151a7cbb93a8b42920933e72167f
github.com/opencontainers/selinux 3b2399ec5682aea5c9160d44fa53387d7e65ccf5 github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
github.com/ostreedev/ostree-go master github.com/ostreedev/ostree-go master
github.com/pkg/errors v0.8.0 github.com/pkg/errors v0.8.0
github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2 github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2
@ -89,7 +89,7 @@ k8s.io/kube-openapi 275e2ce91dec4c05a4094a7b1daee5560b555ac9 https://github.com/
k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kubernetes/utils k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kubernetes/utils
github.com/mrunalp/fileutils master github.com/mrunalp/fileutils master
github.com/varlink/go master github.com/varlink/go master
github.com/projectatomic/buildah cf753ee6fe1f606c4456d2d76690534f8170d9a3 github.com/projectatomic/buildah 5cd9be61ef71a518749ccbde5e449adac5e4b8c0
github.com/Nvveen/Gotty master github.com/Nvveen/Gotty master
github.com/fsouza/go-dockerclient master github.com/fsouza/go-dockerclient master
github.com/openshift/imagebuilder master github.com/openshift/imagebuilder master

View File

@ -130,7 +130,7 @@ func Relabel(path string, fileLabel string, shared bool) error {
return nil return nil
} }
exclude_paths := map[string]bool{"/": true, "/usr": true, "/etc": true} exclude_paths := map[string]bool{"/": true, "/usr": true, "/etc": true, "/tmp": true, "/home": true, "/run": true, "/var": true, "/root": true}
if exclude_paths[path] { if exclude_paths[path] {
return fmt.Errorf("SELinux relabeling of %s is not allowed", path) return fmt.Errorf("SELinux relabeling of %s is not allowed", path)
} }

View File

@ -1,4 +1,4 @@
// +build linux // +build selinux,linux
package selinux package selinux

View File

@ -1,4 +1,4 @@
// +build !linux // +build !selinux
package selinux package selinux
@ -30,6 +30,11 @@ func SetDisabled() {
return return
} }
// GetEnabled returns whether selinux is currently enabled.
func GetEnabled() bool {
return false
}
// SetFileLabel sets the SELinux label for this path or returns an error. // SetFileLabel sets the SELinux label for this path or returns an error.
func SetFileLabel(fpath string, label string) error { func SetFileLabel(fpath string, label string) error {
return nil return nil

View File

@ -1,4 +1,4 @@
// +build linux // +build selinux,linux
package selinux package selinux

View File

@ -5,9 +5,9 @@ package buildah
import ( import (
"io/ioutil" "io/ioutil"
"github.com/docker/docker/profiles/seccomp"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"
seccomp "github.com/seccomp/containers-golang"
) )
func setupSeccomp(spec *specs.Spec, seccompProfilePath string) error { func setupSeccomp(spec *specs.Spec, seccompProfilePath string) error {

View File

@ -1145,9 +1145,9 @@ func runUsingRuntimeMain() {
os.Exit(1) os.Exit(1)
} }
// Set ourselves up to read the container's exit status. We're doing this in a child process // Set ourselves up to read the container's exit status. We're doing this in a child process
// so that we won't mess with the setting in a caller of the library. // so that we won't mess with the setting in a caller of the library. This stubs to OS specific
if err := unix.Prctl(unix.PR_SET_CHILD_SUBREAPER, uintptr(1), 0, 0, 0); err != nil { // calls
fmt.Fprintf(os.Stderr, "prctl(PR_SET_CHILD_SUBREAPER, 1): %v\n", err) if err := setChildProcess(); err != nil {
os.Exit(1) os.Exit(1)
} }
// Run the container, start to finish. // Run the container, start to finish.
@ -1323,7 +1323,7 @@ func runUsingRuntime(options RunOptions, configureNetwork bool, configureNetwork
}() }()
if configureNetwork { if configureNetwork {
teardown, err := runConfigureNetwork(options, configureNetwork, configureNetworks, pid, containerName, spec.Process.Args) teardown, err := runConfigureNetwork(options, configureNetworks, pid, containerName, spec.Process.Args)
if teardown != nil { if teardown != nil {
defer teardown() defer teardown()
} }
@ -1453,7 +1453,7 @@ func runCollectOutput(fds ...int) string {
return b.String() return b.String()
} }
func runConfigureNetwork(options RunOptions, configureNetwork bool, configureNetworks []string, pid int, containerName string, command []string) (teardown func(), err error) { func runConfigureNetwork(options RunOptions, configureNetworks []string, pid int, containerName string, command []string) (teardown func(), err error) {
var netconf, undo []*libcni.NetworkConfigList var netconf, undo []*libcni.NetworkConfigList
// Scan for CNI configuration files. // Scan for CNI configuration files.
confdir := options.CNIConfigDir confdir := options.CNIConfigDir

17
vendor/github.com/projectatomic/buildah/run_linux.go generated vendored Normal file
View File

@ -0,0 +1,17 @@
// +build linux
package buildah
import (
"fmt"
"golang.org/x/sys/unix"
"os"
)
func setChildProcess() error {
if err := unix.Prctl(unix.PR_SET_CHILD_SUBREAPER, uintptr(1), 0, 0, 0); err != nil {
fmt.Fprintf(os.Stderr, "prctl(PR_SET_CHILD_SUBREAPER, 1): %v\n", err)
return err
}
return nil
}

View File

@ -0,0 +1,11 @@
// +build !linux
package buildah
import (
"github.com/pkg/errors"
)
func setChildProcess() error {
return errors.New("function not supported on non-linux systems")
}

View File

@ -3,6 +3,7 @@ github.com/blang/semver master
github.com/BurntSushi/toml master github.com/BurntSushi/toml master
github.com/containerd/continuity master github.com/containerd/continuity master
github.com/containernetworking/cni v0.6.0 github.com/containernetworking/cni v0.6.0
github.com/seccomp/containers-golang master
github.com/containers/image master github.com/containers/image master
github.com/containers/storage 0b8ab959bba614a4f88bb3791dbc078c3d47f259 github.com/containers/storage 0b8ab959bba614a4f88bb3791dbc078c3d47f259
github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716 github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716
@ -35,13 +36,13 @@ github.com/opencontainers/image-spec v1.0.0
github.com/opencontainers/runc master github.com/opencontainers/runc master
github.com/opencontainers/runtime-spec v1.0.0 github.com/opencontainers/runtime-spec v1.0.0
github.com/opencontainers/runtime-tools master github.com/opencontainers/runtime-tools master
github.com/opencontainers/selinux 3b2399ec5682aea5c9160d44fa53387d7e65ccf5 github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
github.com/openshift/imagebuilder master github.com/openshift/imagebuilder master
github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460 github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460
github.com/pborman/uuid master github.com/pborman/uuid master
github.com/pkg/errors master github.com/pkg/errors master
github.com/pquerna/ffjson d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac github.com/pquerna/ffjson d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac
github.com/projectatomic/libpod 781eec27b52c842fc83c8b1c97fbf825065f3b0c github.com/projectatomic/libpod master
github.com/sirupsen/logrus master github.com/sirupsen/logrus master
github.com/syndtr/gocapability master github.com/syndtr/gocapability master
github.com/tchap/go-patricia master github.com/tchap/go-patricia master