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

🌱 read in dockerfiles from stdin #9990

Conversation

cahillsf
Copy link
Member

@cahillsf cahillsf commented Jan 11, 2024

What this PR does / why we need it:
this implements the workaround mentioned here: moby/buildkit#1368 (comment) for avoiding an incorrectly cached Dockerfile

All of the unmodified docker-build-* targets leverage the --build-arg package option and intentionally use the same Dockerfile located in the root dir change has been applied to each build target

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #9752

details of findings in this comment: #9752 (comment)

/area release

@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/release Issues or PRs related to releasing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 11, 2024
@cahillsf cahillsf changed the title 🌱 read in dockerfile from stdin 🌱 read in dockerfiles from stdin Jan 11, 2024
@cahillsf
Copy link
Member Author

waiting for this PR to be approved/merged then will take out of draft: https://github.com/kubernetes-sigs/cluster-api/pull/9932/files

@cahillsf cahillsf marked this pull request as ready for review January 22, 2024 13:56
@k8s-ci-robot k8s-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 Jan 22, 2024
@chrischdi
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 23, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: f21d817c9197cc9812ae07b252f92c48e5ef63d6

Makefile Show resolved Hide resolved
@cahillsf cahillsf force-pushed the implement-docker-build-bug-workaround branch from 28a40ad to 8cd92af Compare January 24, 2024 22:02
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 24, 2024
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 24, 2024
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 25, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 03c7ee9fc6d8e506cb21a2a8449081a9e7a7e4d6

@sbueringer
Copy link
Member

Thx!

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2024
@k8s-ci-robot k8s-ci-robot merged commit a86fe31 into kubernetes-sigs:main Jan 25, 2024
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Jan 25, 2024
@chrischdi
Copy link
Member

chrischdi commented Jan 25, 2024

/area ci

EDIT: wrong issue...

@k8s-ci-robot k8s-ci-robot added the area/ci Issues or PRs related to ci label Jan 25, 2024
@chrischdi

This comment was marked as outdated.

@chrischdi

This comment was marked as outdated.

@chrischdi
Copy link
Member

/remove-area ci

@cahillsf
Copy link
Member Author

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot

@cahillsf: new pull request created: #10209

In response to this:

/cherry-pick release-1.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.

@cahillsf
Copy link
Member Author

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot

@cahillsf: #9990 failed to apply on top of branch "release-1.5":

Applying: read in dockerfile from stdin
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 read in dockerfile from stdin
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 release-1.5

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
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release Issues or PRs related to releasing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Investigate how we ended up with a test extension binary in the CAPD image
5 participants