Revert "Merge pull request #821 from bparees/crio"

This reverts commit 9a1bd4dcd1, reversing
changes made to 4957706835.

pkg/api/types.go

@@ -234,9 +234,6 @@ type Config struct {
 	// SourceInfo provides the info about the source to be built rather than relying
 	// on the Downloader to retrieve it.
 	SourceInfo *git.SourceInfo
-
-	// SecurityOpt are passed as options to the docker containers launched by s2i.
-	SecurityOpt []string
 }
 
 // EnvironmentSpec specifies a single environment variable.

pkg/build/strategies/sti/sti.go

@@ -537,8 +537,6 @@ func (builder *STI) Save(config *api.Config) (err error) {
 		NetworkMode:     string(config.DockerNetworkMode),
 		CGroupLimits:    config.CGroupLimits,
 		CapDrop:         config.DropCapabilities,
-		Binds:           config.BuildVolumes,
-		SecurityOpt:     config.SecurityOpt,
 	}
 
 	dockerpkg.StreamContainerIO(errReader, nil, func(s string) { glog.Info(s) })
@@ -596,7 +594,6 @@ func (builder *STI) Execute(command string, user string, config *api.Config) err
 		CGroupLimits:    config.CGroupLimits,
 		CapDrop:         config.DropCapabilities,
 		Binds:           config.BuildVolumes,
-		SecurityOpt:     config.SecurityOpt,
 	}
 
 	// If there are injections specified, override the original assemble script

pkg/docker/docker.go

@@ -220,8 +220,6 @@ type RunContainerOptions struct {
 	// 2) it only gets applied when Command equals to "assemble" or "usage" script
 	// AND script is inside of the tar archive.
 	CommandExplicit []string
-	// SecurityOpt is passed through as security options to the underlying container.
-	SecurityOpt []string
 }
 
 // asDockerConfig converts a RunContainerOptions into a Config understood by the
@@ -246,7 +244,6 @@ func (rco RunContainerOptions) asDockerHostConfig() dockercontainer.HostConfig {
 		PublishAllPorts: rco.TargetImage,
 		NetworkMode:     dockercontainer.NetworkMode(rco.NetworkMode),
 		Binds:           rco.Binds,
-		SecurityOpt:     rco.SecurityOpt,
 	}
 	if rco.CGroupLimits != nil {
 		hostConfig.Resources.Memory = rco.CGroupLimits.MemoryLimitBytes