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

fix: make env PROXY_URL avaliable in Docker container. #4771

Merged
merged 1 commit into from
May 27, 2024

Conversation

yangxiang92
Copy link

@yangxiang92 yangxiang92 commented May 24, 2024

Fix the issue mentioned in #4747.

Summary by CodeRabbit

  • Chores
    • Updated server start command in Dockerfile for improved compatibility with proxychains.

Copy link

vercel bot commented May 24, 2024

@shawn-mxi-ai is attempting to deploy a commit to the NextChat Team on Vercel.

A member of the Team first needs to authorize it.

Copy link

coderabbitai bot commented May 24, 2024

Walkthrough

The change in the Dockerfile involves modifying the command used to start the server. Specifically, it removes the quotes around the node server.js --host 0.0.0.0 command within a conditional block that uses proxychains -f $conf. This adjustment ensures the command executes correctly without unnecessary quotation marks.

Changes

File Change Summary
Dockerfile Removed quotes around node server.js --host 0.0.0.0 command in a conditional block using proxychains -f $conf.

🐰
In the Dockerfile’s embrace,
Commands now find their place.
With quotes removed, they run so free,
As smooth as a rabbit's glee.
Proxychains and hosts align,
In the server's startup line.
🥕

Tip

New Features and Improvements

Review Settings

Introduced new personality profiles for code reviews. Users can now select between "Chill" and "Assertive" review tones to tailor feedback styles according to their preferences. The "Assertive" profile posts more comments and nitpicks the code more aggressively, while the "Chill" profile is more relaxed and posts fewer comments.

AST-based Instructions

CodeRabbit offers customizing reviews based on the Abstract Syntax Tree (AST) pattern matching. Read more about AST-based instructions in the documentation.

Community-driven AST-based Rules

We are kicking off a community-driven initiative to create and share AST-based rules. Users can now contribute their AST-based rules to detect security vulnerabilities, code smells, and anti-patterns. Please see the ast-grep-essentials repository for more information.

New Static Analysis Tools

We are continually expanding our support for static analysis tools. We have added support for biome, hadolint, and ast-grep. Update the settings in your .coderabbit.yaml file or head over to the settings page to enable or disable the tools you want to use.

Tone Settings

Users can now customize CodeRabbit to review code in the style of their favorite characters or personalities. Here are some of our favorite examples:

  • Mr. T: "You must talk like Mr. T in all your code reviews. I pity the fool who doesn't!"
  • Pirate: "Arr, matey! Ye must talk like a pirate in all yer code reviews. Yarrr!"
  • Snarky: "You must be snarky in all your code reviews. Snark, snark, snark!"

Revamped Settings Page

We have redesigned the settings page for a more intuitive layout, enabling users to find and adjust settings quickly. This change was long overdue; it not only improves the user experience but also allows our development team to add more settings in the future with ease. Going forward, the changes to .coderabbit.yaml will be reflected in the settings page, and vice versa.

Miscellaneous

  • Turn off free summarization: You can switch off free summarization of PRs opened by users not on a paid plan using the enable_free_tier setting.
  • Knowledge-base scope: You can now set the scope of the knowledge base to either the repository (local) or the organization (global) level using the knowledge_base setting. In addition, you can specify Jira project keys and Linear team keys to limit the knowledge base scope for those integrations.
  • High-level summary placement: You can now customize the location of the high-level summary in the PR description using the high_level_summary_placeholder setting (default @coderabbitai summary).
  • Revamped request changes workflow: You can now configure CodeRabbit to auto-approve or request changes on PRs based on the review feedback using the request_changes_workflow setting.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

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>.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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

@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

Outside diff range and nitpick comments (5)
Dockerfile (5)

Line range hint 5-5: Pin package versions in apk add commands to ensure reproducibility.

- RUN apk add --no-cache libc6-compat
+ RUN apk add --no-cache libc6-compat=<version>

Line range hint 12-12: Consider consolidating consecutive RUN instructions to reduce the number of layers in the Docker image.

- RUN yarn config set registry 'https://registry.npmmirror.com/'
- RUN yarn install
+ RUN yarn config set registry 'https://registry.npmmirror.com/' && \
+     yarn install

Line range hint 16-16: Pin package versions in apk add commands to ensure reproducibility.

- RUN apk update && apk add --no-cache git
+ RUN apk update && apk add --no-cache git=<version>

Line range hint 31-31: Use the --no-cache switch to avoid the need to use --update and remove /var/cache/apk/* when done installing packages. Also, pin package versions.

- RUN apk update && apk add --no-cache git
+ RUN apk add --no-cache git=<version>

Line range hint 45-45: Use JSON notation for CMD and ENTRYPOINT arguments to ensure they are interpreted correctly.

- CMD if [ -n "$PROXY_URL" ]; then \
-     export HOSTNAME="127.0.0.1"; \
-     protocol=$(echo $PROXY_URL | cut -d: -f1); \
-     host=$(echo $PROXY_URL | cut -d/ -f3 | cut -d: -f1); \
-     port=$(echo $PROXY_URL | cut -d: -f3); \
-     conf=/etc/proxychains.conf; \
-     echo "strict_chain" > $conf; \
-     echo "proxy_dns" >> $conf; \
-     echo "remote_dns_subnet 224" >> $conf; \
-     echo "tcp_read_time_out 15000" >> $conf; \
-     echo "tcp_connect_time_out 8000" >> $conf; \
-     echo "localnet 127.0.0.0/255.0.0.0" >> $conf; \
-     echo "localnet ::1/128" >> $conf; \
-     echo "[ProxyList]" >> $conf; \
-     echo "$protocol $host $port" >> $conf; \
-     cat /etc/proxychains.conf; \
-     proxychains -f $conf node server.js --host 0.0.0.0; \
-     else \
-     node server.js; \
-     fi
+ CMD ["sh", "-c", "if [ -n \"$PROXY_URL\" ]; then \
+     export HOSTNAME=\"127.0.0.1\"; \
+     protocol=$(echo $PROXY_URL | cut -d: -f1); \
+     host=$(echo $PROXY_URL | cut -d/ -f3 | cut -d: -f1); \
+     port=$(echo $PROXY_URL | cut -d: -f3); \
+     conf=/etc/proxychains.conf; \
+     echo \"strict_chain\" > $conf; \
+     echo \"proxy_dns\" >> $conf; \
+     echo \"remote_dns_subnet 224\" >> $conf; \
+     echo \"tcp_read_time_out 15000\" >> $conf; \
+     echo \"tcp_connect_time_out 8000\" >> $conf; \
+     echo \"localnet 127.0.0.0/255.0.0.0\" >> $conf; \
+     echo \"localnet ::1/128\" >> $conf; \
+     echo \"[ProxyList]\" >> $conf; \
+     echo \"$protocol $host $port\" >> $conf; \
+     cat /etc/proxychains.conf; \
+     proxychains -f $conf node server.js --host 0.0.0.0; \
+     else \
+     node server.js; \
+     fi"]
Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 3866448 and bf3bc3c.
Files selected for processing (1)
  • Dockerfile (1 hunks)
Additional Context Used
Hadolint (6)
Dockerfile (6)

5: Pin versions in apk add. Instead of apk add <package> use apk add <package>=<version>


12: Multiple consecutive RUN instructions. Consider consolidation.


16: Pin versions in apk add. Instead of apk add <package> use apk add <package>=<version>


31: Use the --no-cache switch to avoid the need to use --update and remove /var/cache/apk/* when done installing packages


31: Pin versions in apk add. Instead of apk add <package> use apk add <package>=<version>


45: Use arguments JSON notation for CMD and ENTRYPOINT arguments

Copy link
Contributor

Your build has completed!

Preview deployment

@Dean-YZG Dean-YZG merged commit da2e237 into ChatGPTNextWeb:main May 27, 2024
1 of 2 checks passed
@xzygreen xzygreen mentioned this pull request May 27, 2024
3 tasks
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.

None yet

4 participants