Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docker compat API fixes #8409

Merged
merged 1 commit into from
Nov 23, 2020
Merged

Docker compat API fixes #8409

merged 1 commit into from
Nov 23, 2020

Conversation

mlegenovic
Copy link
Contributor

These are the first fixes that are needed for development environments like
Eclipse or IntelliJ, that have Docker plug-ins and use the Docker API to speak
with container engine (#7857)

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 19, 2020
@zhangguanzhang
Copy link
Collaborator

need format

@mheon
Copy link
Member

mheon commented Nov 19, 2020

CI is complaining that pkg/domain/entities/images.go needs a gofmt -s -w run.

mheon
mheon reviewed Nov 19, 2020
View reviewed changes
pkg/api/handlers/types.go Outdated
@@ -215,7 +215,7 @@ func ImageToImageSummary(l *libpodImage.Image) (*entities.ImageSummary, error) {
Created: l.Created().Unix(),
Size: int64(*size),
SharedSize: 0,
VirtualSize: l.VirtualSize,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is correct as-is, though the VirtualSize output itself may be bugged right now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I absolutely agree. The only reason why I did it that way is because my Go knowledge is minimal, so I couldn't figure out why it's wrong now. So I looked at what inspect command does and took it from there.

@mheon
Copy link
Member

mheon commented Nov 19, 2020

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon, mlegenovic

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2020
@jwhonce
Copy link
Member

jwhonce commented Nov 20, 2020 •
edited
Loading

@mlegenovic Thanks for the PR. To save you an additional hurdle, when you push the formatted code you need to sign your PR.

For example...

git commit -a --amend -s
git push --force

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 22, 2020
@rhatdan
Copy link
Member

rhatdan commented Nov 23, 2020

@mlegenovic Still working on this? Is this still a WIP or can we remove this flag?

@mlegenovic
Copy link
Contributor Author

@rhatdan The only reason why I set the WIP flag is because the issue is not yet solved with these changes. But the changes are completely independent and can be merged, so WIP can be removed.

@mlegenovic mlegenovic changed the title [WIP] Docker compat API fixes Docker compat API fixes Nov 23, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 23, 2020
@rhatdan
Copy link
Member

rhatdan commented Nov 23, 2020

Great @mlegenovic Only issue then is @mheon comments on Virtual Size. Can you revert that change and then we can get this reviewed and into the package.

@mlegenovic
[WIP] Docker compat API fixes
6f7b706 
These are the first fixes that are needed for development environments like
Eclipse or IntelliJ that have Docker plug-ins and use the Docker API to speak
with container engine (#7857)

Signed-off-by: Milivoje Legenovic <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Nov 23, 2020

LGTM
@containers/podman-maintainers PTAL

@baude
Copy link
Member

baude commented Nov 23, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 23, 2020
@openshift-merge-robot openshift-merge-robot merged commit 5d55285 into containers:master Nov 23, 2020
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mheon mheon mheon left review comments

Assignees

@baude baude

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@mlegenovic @zhangguanzhang @mheon @openshift-ci-robot @jwhonce @rhatdan @baude @openshift-merge-robot