Resolve dockerfile path based on original, non-redirected config path #10005
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: 4d4646b The changes in this PR will be included in the next version bump. This PR includes changesets to release 4 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
Failed to automatically backport this PR's changes to Wrangler v3. Please manually create a PR targeting the Depending on your changes, running Notes:
|
create-cloudflare
@cloudflare/kv-asset-handler
miniflare
@cloudflare/pages-shared
@cloudflare/unenv-preset
@cloudflare/vite-plugin
@cloudflare/vitest-pool-workers
@cloudflare/workers-editor-shared
wrangler
commit: |
emily-shen
force-pushed
the
emily/dockerfile-resolution-again
branch
from
0d98db5 to
db182fd
Compare
emily-shen
force-pushed
the
emily/dockerfile-resolution-again
branch
from
db182fd to
4d4646b
Compare
dario-piotrowicz
approved these changes
Jul 21, 2025
| @@ -17,6 +17,7 @@ export async function maybeBuildContainer( | |||
| imageTag: string, | |||
| dryRun: boolean, | |||
| pathToDocker: string, | |||
| /** The original (non-redirected) user config path */ | |||
There was a problem hiding this comment.
what about renaming the parameter userConfigPath to avoid possible future confusion? 🤔
There was a problem hiding this comment.
ah that's probably better, but this needs to go out in the next release so i'm just going to kick this one through as is - sorry!
| @@ -346,6 +346,113 @@ describe("wrangler deploy with containers", () => { | |||
| expect(std.warn).toMatchInlineSnapshot(`""`); | |||
| }); | |||
|
|
|||
| it("resolve the dockerfile based on the non-redirected userConfigPath rather than the actual config path", async () => { | |||
There was a problem hiding this comment.
Suggested change
| it("resolve the dockerfile based on the non-redirected userConfigPath rather than the actual config path", async () => { | |
| it("resolve the dockerfile based on the non-redirected userConfigPath rather than the redirected config path", async () => { |
🤔 ?
dario-piotrowicz
added
the
skip-v3-pr
flakey5
approved these changes
Jul 21, 2025
Merged
pombosilva
pushed a commit
that referenced
this pull request
Jul 22, 2025
pombosilva
added a commit
that referenced
this pull request
Jul 22, 2025
This reverts commit 5c11fe7.
emily-shen
added a commit
that referenced
this pull request
Jul 22, 2025
This reverts commit 64d71b1.
emily-shen
added a commit
that referenced
this pull request
Jul 22, 2025
6 tasks
pombosilva
added a commit
that referenced
this pull request
Jul 22, 2025
…name matches its own Worker name removing try catch since error gets thrown either way use userConfigPath instead of redirected one (#10005) Revert "use userConfigPath instead of redirected one (#10005)" This reverts commit 5c11fe7. fix deep import prettier run fix: make vitest-pool-workers not break if Workflow binding's script_name matches its own Worker name
pombosilva
added a commit
that referenced
this pull request
Jul 22, 2025
…name matches its own Worker name removing try catch since error gets thrown either way use userConfigPath instead of redirected one (#10005) Revert "use userConfigPath instead of redirected one (#10005)" This reverts commit 5c11fe7. fix deep import prettier run fix: make vitest-pool-workers not break if Workflow binding's script_name matches its own Worker name
pombosilva
added a commit
that referenced
this pull request
Jul 22, 2025
…name matches its own Worker name removing try catch since error gets thrown either way use userConfigPath instead of redirected one (#10005) Revert "use userConfigPath instead of redirected one (#10005)" This reverts commit 5c11fe7. fix deep import prettier run fix: make vitest-pool-workers not break if Workflow binding's script_name matches its own Worker name
pombosilva
added a commit
that referenced
this pull request
Jul 24, 2025
…name matches its own Worker name removing try catch since error gets thrown either way use userConfigPath instead of redirected one (#10005) Revert "use userConfigPath instead of redirected one (#10005)" This reverts commit 5c11fe7. fix deep import prettier run fix: make vitest-pool-workers not break if Workflow binding's script_name matches its own Worker name
pombosilva
added a commit
that referenced
this pull request
Jul 24, 2025
…hes its own Worker name (#10033) * fix: make vitest-pool-workers not break if Workflow binding's script_name matches its own Worker name removing try catch since error gets thrown either way use userConfigPath instead of redirected one (#10005) Revert "use userConfigPath instead of redirected one (#10005)" This reverts commit 5c11fe7. fix deep import prettier run fix: make vitest-pool-workers not break if Workflow binding's script_name matches its own Worker name * apply suggestions from code review * code review suggestion: delete script_name instead of replacing it
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
userConfigPath is the path of the original wrangler config, while configPath could point to a redirected wrangler config. We should resolve the dockerfile and build context based on the original config's path. This makes sure containers can be deployed if the app has been built by the vite plugin.