From e42cbdd1b2f6788a814d6aa1838111989cd424ad Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 23 Mar 2020 16:18:17 -0400 Subject: Add bindings for Container Exec Create + Inspect Also adds some basic tests for these two. More tests are needed but will have to wait for state to be finished. Signed-off-by: Matthew Heon --- libpod/container_exec.go | 5 +++++ libpod/options.go | 2 ++ 2 files changed, 7 insertions(+) (limited to 'libpod') diff --git a/libpod/container_exec.go b/libpod/container_exec.go index 795eb7453..912c2c226 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -231,6 +231,11 @@ func (c *Container) ExecStartAndAttach(sessionID string, streams *AttachStreams) } } + // Verify that we are in a good state to continue + if !c.ensureState(define.ContainerStateRunning) { + return errors.Wrapf(define.ErrCtrStateInvalid, "can only start exec sessions when their container is running") + } + session, ok := c.state.ExecSessions[sessionID] if !ok { return errors.Wrapf(define.ErrNoSuchExecSession, "container %s has no exec session with ID %s", c.ID(), sessionID) diff --git a/libpod/options.go b/libpod/options.go index 9b61d7947..74f9c485e 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -21,6 +21,8 @@ import ( var ( // NameRegex is a regular expression to validate container/pod names. + // This must NOT be changed from outside of Libpod. It should be a + // constant, but Go won't let us do that. NameRegex = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$") // RegexError is thrown in presence of an invalid container/pod name. RegexError = errors.Wrapf(define.ErrInvalidArg, "names must match [a-zA-Z0-9][a-zA-Z0-9_.-]*") -- cgit v1.2.3-54-g00ecf