Skip to content

Allow self-hosted deploys locally without using tunnel #2064

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

Merged
merged 1 commit into from
May 16, 2025

Conversation

ericallam
Copy link
Member

@ericallam ericallam commented May 15, 2025

Summary by CodeRabbit

  • Documentation

    • Updated build instructions to include all components, not just the webapp.
    • Clarified development setup wording in the supervisor app's README.
  • Bug Fixes

    • Improved environment variable handling to prefer a dedicated API origin if available.
  • New Features

    • Enhanced Docker build process on macOS to ensure local servers are accessible from containers.

Copy link

changeset-bot bot commented May 15, 2025

⚠️ No Changeset found

Latest commit: 5edf0f3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented May 15, 2025

Walkthrough

The updates include documentation changes to clarify build instructions and wording, an adjustment to environment variable usage for API URLs in a loader function, and an enhancement to Docker build logic to normalize API URLs on macOS. A new helper function was introduced to support platform-specific URL normalization.

Changes

File(s) Change Summary
CONTRIBUTING.md Updated build step to include building multiple components and revised step title to "Build everything."
apps/supervisor/README.md Changed setup instruction wording from "deploy a reference project" to "deploy a test project."
apps/webapp/app/routes/api.v1.projects.$projectRef.$env.ts Modified loader function to prefer API_ORIGIN over APP_ORIGIN for the apiUrl property.
packages/cli-v3/src/deploy/buildImage.ts Added normalizeApiUrlForBuild to adjust API URL for Docker builds on macOS; updated build arg logic accordingly.

Sequence Diagram(s)

sequenceDiagram
    participant Developer
    participant BuildScript
    participant Docker
    participant LocalServer

    Developer->>BuildScript: Run build (with API URL)
    BuildScript->>normalizeApiUrlForBuild: Normalize API URL (check platform)
    normalizeApiUrlForBuild-->>BuildScript: Return normalized URL
    BuildScript->>Docker: Pass normalized API URL as build arg
    Docker->>LocalServer: Connect using API URL (host.docker.internal or localhost)
Loading

Poem

🐇
A tweak for the docs, a build step anew,
URLs now smarter, for Mac users too!
If you’re spinning up Docker, don’t fret or stall—
“host.docker.internal” will answer your call.
With words refined and logic tight,
The project hops forward, feeling just right!

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
CONTRIBUTING.md (1)

73-73: Add language specifier to fenced code block.

The fenced code block is missing a language specifier, which is flagged by markdownlint.

-    ```
+    ```sh
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge Base: Disabled due to data retention organization setting

📥 Commits

Reviewing files that changed from the base of the PR and between bb7173b and 5edf0f3.

📒 Files selected for processing (4)
  • CONTRIBUTING.md (1 hunks)
  • apps/supervisor/README.md (1 hunks)
  • apps/webapp/app/routes/api.v1.projects.$projectRef.$env.ts (1 hunks)
  • packages/cli-v3/src/deploy/buildImage.ts (2 hunks)
🧰 Additional context used
🪛 markdownlint-cli2 (0.17.2)
CONTRIBUTING.md

72-72: Fenced code blocks should have a language specified
null

(MD040, fenced-code-language)

⏰ Context from checks skipped due to timeout of 90000ms (7)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - npm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)
  • GitHub Check: typecheck / typecheck
  • GitHub Check: units / 🧪 Unit Tests
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (5)
apps/supervisor/README.md (1)

39-39: Wording improvement looks good.

The change from "reference project" to "test project" is appropriate and makes the intent clearer.

apps/webapp/app/routes/api.v1.projects.$projectRef.$env.ts (1)

91-91: API URL environment variable change improves flexibility.

This change adds a fallback mechanism for API URL determination, preferring API_ORIGIN if available, otherwise falling back to APP_ORIGIN. This supports the goal of enabling local self-hosted deployments without tunnels.

This change aligns with the normalizeApiUrlForBuild helper function added in buildImage.ts.

CONTRIBUTING.md (1)

71-74: Comprehensive build instructions now cover all necessary components.

The build instructions have been updated to cover all required components instead of just the webapp, which is more thorough and will help prevent issues when testing changes that span multiple packages.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

72-72: Fenced code blocks should have a language specified
null

(MD040, fenced-code-language)

packages/cli-v3/src/deploy/buildImage.ts (2)

330-330: Improved Docker network handling for local development.

The API URL is now normalized before being passed as a build argument, which addresses connectivity issues between Docker containers and the host machine, particularly on macOS.


727-735: Well-implemented platform-specific URL normalization.

The normalizeApiUrlForBuild function intelligently handles the platform-specific networking requirements for Docker. On macOS, it replaces "localhost" with "host.docker.internal" to ensure Docker containers can properly communicate with services on the host.

This change is crucial for enabling local self-hosted deployments without tunnels, which is the core goal of this PR.

@matt-aitken matt-aitken merged commit a69621b into main May 16, 2025
12 checks passed
@matt-aitken matt-aitken deleted the ea-branch-62 branch May 16, 2025 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants