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

Vendor in latest buildah code #3573

Merged
merged 1 commit into from
Aug 1, 2019
Merged

Vendor in latest buildah code #3573

merged 1 commit into from
Aug 1, 2019

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jul 13, 2019 •
edited
Loading

Update to buildah 1.9.2 to fix performance issue on

COPY . /tmp

without .dockerignore file.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 13, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Jul 13, 2019

@vrothberg PTAL

I am not sure if I am doing the vendoring in correctly.

vrothberg
vrothberg reviewed Jul 15, 2019
View reviewed changes
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM but the remote tests are going south

h-vetinari
h-vetinari reviewed Jul 16, 2019
View reviewed changes
Copy link

@h-vetinari h-vetinari left a comment

Choose a reason for hiding this comment

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

There's a lot more happening with dependencies than what would be obvious to a layman (=me) from a simple version bump in a vendored library. Just stumbled over a few peculiarities, which might be relevant.

go.sum Show resolved Hide resolved
go.mod Outdated
github.com/opencontainers/runtime-spec v0.0.0-20181111125026-1722abf79c2f
github.com/opencontainers/runtime-tools v0.9.0
github.com/opencontainers/runtime-spec v1.0.1
github.com/opencontainers/runtime-tools v0.8.0
Copy link

Choose a reason for hiding this comment

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

This used to be 0.9.0; why downgrade? Also, further down the hash for version 0.3.1 is added.

Copy link
Member

Choose a reason for hiding this comment

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

Good catch. This comes from buildah's go module which is using v0.8.0.

@rhatdan, can you revert to using v0.9.0 again?

Copy link
Member Author

Choose a reason for hiding this comment

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

Nalin just opened a PR for updating Buildah, which hopefully will fix this. Once we have it vendored, we can cut buildah 1.9.2 and update this PR.

@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #3522) made this pull request unmergeable. Please resolve the merge conflicts.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2019
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Jul 19, 2019

/test images

2 similar comments
@rhatdan
Copy link
Member Author

rhatdan commented Jul 21, 2019

/test images

@vrothberg
Copy link
Member

/test images

@vrothberg
Copy link
Member

@rhatdan, some changes need to be added after a make vendor:

[libpod (pull-request-3573)]$ gits
On branch pull-request-3573
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   go.mod
        modified:   go.sum
        modified:   vendor/github.com/vishvananda/netns/README.md
        modified:   vendor/github.com/vishvananda/netns/netns_linux.go
        modified:   vendor/modules.txt

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        vendor/github.com/containers/buildah/.cirrus.yml
        vendor/github.com/containers/buildah/.golangci.yml
        vendor/github.com/containers/buildah/go.mod
        vendor/github.com/containers/buildah/go.sum
        vendor/github.com/containers/buildah/imagebuildah/executor.go
        vendor/github.com/containers/buildah/imagebuildah/stage_executor.go
        vendor/github.com/ishidawataru/sctp/GO_LICENSE
        vendor/github.com/ishidawataru/sctp/ipsock_linux.go

@rhatdan rhatdan force-pushed the vendor branch 3 times, most recently from e5bf05f to 9cc7295 Compare July 22, 2019 11:56
@vrothberg
Copy link
Member

Looks like something went wrong and removed ginkgo etc.: +63 −1,108,301

@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #3598) made this pull request unmergeable. Please resolve the merge conflicts.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2019
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 23, 2019
@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #3630) made this pull request unmergeable. Please resolve the merge conflicts.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 23, 2019
@rhatdan
Vendor in buildah 1.9.2
141c7a5 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 30, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Aug 1, 2019

Doing a force merge just to get this in, rather then doing the merge dance again.

@rhatdan rhatdan merged commit 39de184 into containers:master Aug 1, 2019
This was referenced Aug 1, 2019
Merged
Closed
@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 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vrothberg vrothberg vrothberg left review comments

@h-vetinari h-vetinari h-vetinari left review comments

@jwhonce jwhonce Awaiting requested review from jwhonce

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rhatdan @openshift-ci-robot @rh-atomic-bot @vrothberg @h-vetinari