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

Updating container dependencies #102

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Updating container dependencies #102

merged 2 commits into from
Dec 3, 2024

Conversation

bcaton85
Copy link
Contributor

@bcaton85 bcaton85 commented Dec 3, 2024

Tested by running build with a Dockerfile containing ARG and multiple stages.

kleesc
kleesc approved these changes Dec 3, 2024
View reviewed changes
Copy link
Member

@kleesc kleesc left a comment

Choose a reason for hiding this comment

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

lgtm

@bcaton85 bcaton85 merged commit bbf56c6 into quay:master Dec 3, 2024
3 checks passed
@bcaton85
Copy link
Contributor Author

bcaton85 commented Dec 3, 2024

/cherry-pick redhat-3.13

@bcaton85
Copy link
Contributor Author

bcaton85 commented Dec 3, 2024

/cherry-pick redhat-3.12

@openshift-cherrypick-robot
Copy link
Contributor

@bcaton85: #102 failed to apply on top of branch "redhat-3.13":

Applying: upgrading packages
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 upgrading packages

In response to this:

/cherry-pick redhat-3.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Contributor

@bcaton85: new pull request created: #103

In response to this:

/cherry-pick redhat-3.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 3, 2024
Merged
bcaton85 added a commit to bcaton85/quay-builder that referenced this pull request Dec 3, 2024
@bcaton85
Updating container dependencies (quay#102)
1441e6e 
Updating dependencies
bcaton85 added a commit that referenced this pull request Dec 3, 2024
@bcaton85
Updating container dependencies (#102) (#104)
97ef6f2 
Updating dependencies
@bcaton85
Copy link
Contributor Author

bcaton85 commented Dec 9, 2024

/cherry-pick redhat-3.11

@bcaton85
Copy link
Contributor Author

bcaton85 commented Dec 9, 2024

/cherry-pick redhat-3.10

@bcaton85
Copy link
Contributor Author

bcaton85 commented Dec 9, 2024

/cherry-pick redhat-3.9

@openshift-cherrypick-robot
Copy link
Contributor

@bcaton85: #102 failed to apply on top of branch "redhat-3.11":

Applying: upgrading packages
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 upgrading packages

In response to this:

/cherry-pick redhat-3.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Contributor

@bcaton85: #102 failed to apply on top of branch "redhat-3.10":

Applying: upgrading packages
Using index info to reconstruct a base tree...
M	Dockerfile
M	containerclient/dockerfile/dockerfile.go
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 upgrading packages

In response to this:

/cherry-pick redhat-3.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Contributor

@bcaton85: #102 failed to apply on top of branch "redhat-3.9":

Applying: upgrading packages
Using index info to reconstruct a base tree...
M	Dockerfile
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 upgrading packages

In response to this:

/cherry-pick redhat-3.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

bcaton85 added a commit to bcaton85/quay-builder that referenced this pull request Dec 9, 2024
@bcaton85
Updating container dependencies (quay#102)
8eef4e6 
Updating dependencies
bcaton85 added a commit to bcaton85/quay-builder that referenced this pull request Dec 9, 2024
@bcaton85
Updating container dependencies (quay#102)
a1fbca5 
Updating dependencies
bcaton85 added a commit to bcaton85/quay-builder that referenced this pull request Dec 9, 2024
@bcaton85
Updating container dependencies (quay#102)
e36204e 
Updating dependencies
bcaton85 added a commit that referenced this pull request Dec 11, 2024
@bcaton85
Updating container dependencies (#102) (#106)
b07ce56 
Updating dependencies
bcaton85 added a commit that referenced this pull request Dec 11, 2024
@bcaton85
Updating container dependencies (#102) (#108)
83bdf58 
* Updating container dependencies (#102)

Updating dependencies

* updating podman
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kleesc kleesc kleesc approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bcaton85 @openshift-cherrypick-robot @kleesc