github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

log: log the actual error message when creating the Docker API client

Browse Source 
Signed-off-by: Krisztian Horvath <keyki.kk@gmail.com>
This commit is contained in:
Krisztian Horvath 2019-01-02 17:12:40 +01:00
parent cf20f3d66b
commit c68f52c76f
No known key found for this signature in database
GPG Key ID: D01ABF03AE23FBBD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/linuxkit/moby/docker.go
View File

@ -76,7 +76,7 @@ func dockerCreate(image string) (string, error) {
log.Debugf("docker create: %s", image) log.Debugf("docker create: %s", image)
cli, err := dockerClient() cli, err := dockerClient()
if err != nil { if err != nil {
return "", errors.New("could not initialize Docker API client") return "", errors.New("could not initialize Docker API client: " + err.Error())
} }
// we do not ever run the container, so /dev/null is used as command // we do not ever run the container, so /dev/null is used as command
config := &container.Config{ config := &container.Config{
@ -96,7 +96,7 @@ func dockerExport(container string) (io.ReadCloser, error) {
log.Debugf("docker export: %s", container) log.Debugf("docker export: %s", container)
cli, err := dockerClient() cli, err := dockerClient()
if err != nil { if err != nil {
return nil, errors.New("could not initialize Docker API client") return nil, errors.New("could not initialize Docker API client: " + err.Error())
} }
responseBody, err := cli.ContainerExport(context.Background(), container) responseBody, err := cli.ContainerExport(context.Background(), container)
if err != nil { if err != nil {
@ -110,7 +110,7 @@ func dockerRm(container string) error {
log.Debugf("docker rm: %s", container) log.Debugf("docker rm: %s", container)
cli, err := dockerClient() cli, err := dockerClient()
if err != nil { if err != nil {
return errors.New("could not initialize Docker API client") return errors.New("could not initialize Docker API client: " + err.Error())
} }
if err = cli.ContainerRemove(context.Background(), container, types.ContainerRemoveOptions{}); err != nil { if err = cli.ContainerRemove(context.Background(), container, types.ContainerRemoveOptions{}); err != nil {
return err return err
@ -123,7 +123,7 @@ func dockerPull(ref *reference.Spec, forcePull, trustedPull bool) error {
log.Debugf("docker pull: %s", ref) log.Debugf("docker pull: %s", ref)
cli, err := dockerClient() cli, err := dockerClient()
if err != nil { if err != nil {
return errors.New("could not initialize Docker API client") return errors.New("could not initialize Docker API client: " + err.Error())
} }
if trustedPull { if trustedPull {