summaryrefslogtreecommitdiff
path: root/libpod/container.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2017-11-03 14:37:22 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-17 02:07:18 +0000
commitd2eda1a8648b7e6053627e48bf500f9671f0a6c2 (patch)
tree0b86ea7165ab02003b9e6fc480432774a72724a6 /libpod/container.go
parentbf8b9a37df2aeead009996875f58c59625110472 (diff)
downloadpodman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.tar.gz
podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.tar.bz2
podman-d2eda1a8648b7e6053627e48bf500f9671f0a6c2.zip
Enhancements to papr tests
The PR contains several enhancements to our CI testing. - enable lint testing on Fedora - add Centos Atomic as test platform - integration tests on run on the OS natively (uncontainerized) - builds are done in containers - inclusion of Vagrant file for local testing Signed-off-by: baude <bbaude@redhat.com> Closes: #18 Approved by: mheon
Diffstat (limited to 'libpod/container.go')
-rw-r--r--libpod/container.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/libpod/container.go b/libpod/container.go
index d93efda97..8e84a1f3e 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -411,14 +411,17 @@ func (c *Container) Attach(noStdin bool, keys string, attached chan<- bool) erro
resize := make(chan remotecommand.TerminalSize)
defer close(resize)
err = c.attachContainerSocket(resize, noStdin, detachKeys, attached)
- if err != nil {
- return err
- }
+
+ return err
+
// TODO
// Re-enable this when mheon is done wth it
+ //if err != nil {
+ // return err
+ //}
//c.ContainerStateToDisk(c)
- return nil
+ //return err
}
// Mount mounts a container's filesystem on the host