diff options
| -rw-r--r-- | docs/podman-events.1.md | 1 | ||||
| -rw-r--r-- | libpod/container_api.go | 1 | ||||
| -rw-r--r-- | libpod/events/events.go | 12 | ||||
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/buildah.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/unshare/unshare.go | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/docs/podman-events.1.md b/docs/podman-events.1.md index 3463d2aaa..40f7e8457 100644 --- a/docs/podman-events.1.md +++ b/docs/podman-events.1.md @@ -32,7 +32,6 @@ The *container* event type will report the follow statuses: * sync * unmount * unpause - * wait The *pod* event type will report the follow statuses: * create diff --git a/libpod/container_api.go b/libpod/container_api.go index 96435c2ff..2a2381923 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -574,7 +574,6 @@ func (c *Container) WaitWithInterval(waitTimeout time.Duration) (int32, error) { return 0, err } exitCode := c.state.ExitCode - c.newContainerEvent(events.Wait) return exitCode, nil } diff --git a/libpod/events/events.go b/libpod/events/events.go index 7db36653e..074a3ba5b 100644 --- a/libpod/events/events.go +++ b/libpod/events/events.go @@ -6,6 +6,7 @@ import ( "os" "time" + "github.com/containers/storage" "github.com/pkg/errors" ) @@ -104,8 +105,6 @@ const ( Unpause Status = "unpause" // Untag ... Untag Status = "untag" - // Wait ... - Wait Status = "wait" ) // EventFilter for filtering events @@ -122,6 +121,13 @@ func NewEvent(status Status) Event { // Write will record the event to the given path func (e *Event) Write(path string) error { + // We need to lock events file + lock, err := storage.GetLockfile(path + ".lock") + if err != nil { + return err + } + lock.Lock() + defer lock.Unlock() f, err := os.OpenFile(path, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0700) if err != nil { return err @@ -261,8 +267,6 @@ func StringToStatus(name string) (Status, error) { return Unpause, nil case Untag.String(): return Untag, nil - case Wait.String(): - return Wait, nil } return "", errors.Errorf("unknown event status %s", name) } diff --git a/vendor.conf b/vendor.conf index d36de6ffc..2adcb136c 100644 --- a/vendor.conf +++ b/vendor.conf @@ -93,7 +93,7 @@ k8s.io/apimachinery kubernetes-1.10.13-beta.0 https://github.com/kubernetes/apim k8s.io/client-go kubernetes-1.10.13-beta.0 https://github.com/kubernetes/client-go github.com/mrunalp/fileutils 7d4729fb36185a7c1719923406c9d40e54fb93c7 github.com/varlink/go 3ac79db6fd6aec70924193b090962f92985fe199 -github.com/containers/buildah c933fe4bc608676d308ffcb276b7d8561a18e94d +github.com/containers/buildah v1.7.2 # TODO: Gotty has not been updated since 2012. Can we find replacement? github.com/Nvveen/Gotty cd527374f1e5bff4938207604a14f2e38a9cf512 github.com/fsouza/go-dockerclient v1.3.0 diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go index febc3d0d1..9625fff96 100644 --- a/vendor/github.com/containers/buildah/buildah.go +++ b/vendor/github.com/containers/buildah/buildah.go @@ -26,7 +26,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.8-dev" + Version = "1.7.2" // The value we use to identify what type of information, currently a // serialized Builder structure, we are using as per-container state. // This should only be changed when we make incompatible changes to diff --git a/vendor/github.com/containers/buildah/unshare/unshare.go b/vendor/github.com/containers/buildah/unshare/unshare.go index 91f4bb54a..77aee282f 100644 --- a/vendor/github.com/containers/buildah/unshare/unshare.go +++ b/vendor/github.com/containers/buildah/unshare/unshare.go @@ -304,5 +304,5 @@ func GetRootlessUID() int { // RootlessEnv returns the environment settings for the rootless containers func RootlessEnv() []string { - return append(os.Environ(), UsernsEnvName+"=") + return append(os.Environ(), UsernsEnvName+"=done") } |