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.

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

build: Update pyrsistent to fix Dockerfile.deploy (PROJQUAY-3125) #1079

Merged
merged 1 commit into from Feb 1, 2022

Conversation

syed
Copy link
Contributor

@syed syed commented Jan 31, 2022

Dockerfile.deply is used for quay.io

@syed syed merged commit 443b8d5 into quay:master Feb 1, 2022
@flavianmissi
Copy link
Contributor

/cherry-pick redhat-3.6

@openshift-cherrypick-robot

@flavianmissi: #1079 failed to apply on top of branch "redhat-3.6":

Applying: build: Update pyrsistent to fix Dockerfile.deploy (PROJQUAY-3125)
Using index info to reconstruct a base tree...
M	Dockerfile
A	Dockerfile.deploy
M	requirements.txt
Falling back to patching base and 3-way merge...
Auto-merging requirements.txt
CONFLICT (modify/delete): Dockerfile.deploy deleted in HEAD and modified in build: Update pyrsistent to fix Dockerfile.deploy (PROJQUAY-3125). Version build: Update pyrsistent to fix Dockerfile.deploy (PROJQUAY-3125) of Dockerfile.deploy left in tree.
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
Patch failed at 0001 build: Update pyrsistent to fix Dockerfile.deploy (PROJQUAY-3125)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick redhat-3.6

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants