Skip to content
Snippets Groups Projects

WIP: Replace github.com/fsouza/go-dockerclient with github.com/docker/engine-api

4 unresolved threads

Helper methods that have changed considerably with the switch:

  • ContainerAttach
  • ContainerLogs
  • ImageImport
  • ImagePull

I'm not sure about the authentication for ImagePull, in particular.

The docker configuration reading code in go-dockerclient was inlined into helpers/docker/auth_config.go. Would love suggestions on how to get away from that.

Two sites in executor_docker.go now construct fake types.Container members with incomplete information (just ID and Name specified). Changing the slices that these are stored in to only hold the id might clean this up. engine-api/client.ContainerInspect returns types.ContainerJSON instead of types.Container, and there isn't a trivial way to convert between the two AFAICT.

Several 'streaming' sites (ContainerLogs, ImageImport) have had consumers open-coded into them, and I'm not sure these are sensible.

Other than that, it's clearly awesome. Thoughts, @ayufan, @tmaczukin?

Closes #1606 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Nick Thomas Added 78 commits:

    Added 78 commits:

    • 364968d4...a5eec436 - 77 commits from branch gitlab-org:master
    • e4f1553c - Merge with master
  • I would really love us to move away from issuing raw docker commands and instead using docker-compose if it's stable enough: https://github.com/docker/libcompose.

    But this is much, much bigger task. But it will basically reduce complexity of executor_docker.go to be a set of created docker-compose.yml.

    Edited by Kamil Trzcińśki
  • Kamil Trzcińśki
  • Kamil Trzcińśki
  • Nick Thomas Added 1 commit:

    Added 1 commit:

    • b0829489 - Fix up Godeps
  • Nick Thomas Added 5 commits:

    Added 5 commits:

    • b0829489...a3d5829a - 4 commits from branch gitlab-org:master
    • 797c6d64 - Resolve merge conflict with 'defer Cleanup()'
  • Nick Thomas Added 11 commits:

    Added 11 commits:

    • 797c6d64...57e93608 - 10 commits from branch gitlab-org:master
    • 5b00b414 - Resolve merge conflict
  • Nick Thomas Added 1 commit:

    Added 1 commit:

    • 4228aea1 - Reorder imports in the docker-ssh executor
  • Author Maintainer

    @bkc notes that engine-api/client is already deprecated in favour of github.com/docker/docker/client

    fml, etc.

    I'm going to start on that in a second branch.

  • @nick.thomas Should we close this MR in such case?

  • mentioned in issue #1222 (closed)

  • Author Maintainer

    @tmaczukin yep, happy with that. Closing in favour of !301 (merged)

    This isn't half turning out to be an adventure!

  • Nick Thomas Status changed to closed

    Status changed to closed

  • Please register or sign in to reply
    Loading