5fee8bddfe
ContainerExecAttach used `types.ExecConfig` instead of `types.ExecStartCheck`, which is the type that's expected by the `/exec/execid/start` API endpoint. Investigating when this inconsistency was introduced, I found that the client has sent the additional properties since its first imlpementation inc786a8ee5e. The `postContainerExecStart()` at that time used the "jobs" package, which only took the information from the body that was needed (`Detach` and `Tty`). Commit24425021d2refactored the Exec commands to remove the "jobs", and introduced the `ExecStartCheck` type, but failed to update the `cli.hijack()` call with the new type. The change in this patch should not affect compatibility with older clients, as the additional information from the `ExecConfig` type is not used (the API server already decodes to the `ExecStartCheck` type). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
54 lines
2 KiB
Go
54 lines
2 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// ContainerExecCreate creates a new exec configuration to run an exec process.
|
|
func (cli *Client) ContainerExecCreate(ctx context.Context, container string, config types.ExecConfig) (types.IDResponse, error) {
|
|
var response types.IDResponse
|
|
|
|
if err := cli.NewVersionError("1.25", "env"); len(config.Env) != 0 && err != nil {
|
|
return response, err
|
|
}
|
|
|
|
resp, err := cli.post(ctx, "/containers/"+container+"/exec", nil, config, nil)
|
|
if err != nil {
|
|
return response, err
|
|
}
|
|
err = json.NewDecoder(resp.body).Decode(&response)
|
|
ensureReaderClosed(resp)
|
|
return response, err
|
|
}
|
|
|
|
// ContainerExecStart starts an exec process already created in the docker host.
|
|
func (cli *Client) ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error {
|
|
resp, err := cli.post(ctx, "/exec/"+execID+"/start", nil, config, nil)
|
|
ensureReaderClosed(resp)
|
|
return err
|
|
}
|
|
|
|
// ContainerExecAttach attaches a connection to an exec process in the server.
|
|
// It returns a types.HijackedConnection with the hijacked connection
|
|
// and the a reader to get output. It's up to the called to close
|
|
// the hijacked connection by calling types.HijackedResponse.Close.
|
|
func (cli *Client) ContainerExecAttach(ctx context.Context, execID string, config types.ExecStartCheck) (types.HijackedResponse, error) {
|
|
headers := map[string][]string{"Content-Type": {"application/json"}}
|
|
return cli.postHijacked(ctx, "/exec/"+execID+"/start", nil, config, headers)
|
|
}
|
|
|
|
// ContainerExecInspect returns information about a specific exec process on the docker host.
|
|
func (cli *Client) ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error) {
|
|
var response types.ContainerExecInspect
|
|
resp, err := cli.get(ctx, "/exec/"+execID+"/json", nil, nil)
|
|
if err != nil {
|
|
return response, err
|
|
}
|
|
|
|
err = json.NewDecoder(resp.body).Decode(&response)
|
|
ensureReaderClosed(resp)
|
|
return response, err
|
|
}
|