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

chore: Fix condition syntax in Dockerfile #37270

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Conversation

sharat87
Copy link
Member

@sharat87 sharat87 commented Nov 7, 2024

Description

The && syntax for and-ing conditions doesn't work with [ command, it only works with [[ expressions. But we can't use [[ expressions, since this isn't bash, it's /bin/sh. We can't use bash, since doing so is throwing up a whole lot of other errors that I've parked for another day, several months ago.

Instead of &&, we have to use -a when using the [ command.

Currently, when building the Docker image, we see the following error:

#8 [3/6] RUN <<END (if ! [ -f info.json ]; then...)
#8 0.142 /bin/sh: 6: [: missing ]
#8 0.142 /bin/sh: 6: -f: not found

It doesn't seem to have an impact, but it is an error nonetheless.

We're also refactoring to not add the executable permission twice, which is redundant. We're only doing it once now.

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/11718707642
Commit: 6c73943
Cypress dashboard.
Tags: @tag.Sanity
Spec:


Thu, 07 Nov 2024 09:18:50 UTC

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

/test sanity

Summary by CodeRabbit

Summary by CodeRabbit

  • Chores
    • Updated the Dockerfile to enhance file existence checks and manage executable permissions for shell scripts.
    • Removed unnecessary directory creation commands for ./editor and ./rts.
    • Maintained existing structure, including exposed ports and health check commands.

Copy link
Contributor

coderabbitai bot commented Nov 7, 2024

Walkthrough

The Dockerfile has been modified to enhance conditional checks for file existence and manage executable permissions for shell scripts. The logical AND operator has been changed from && to -a for checking the presence of server.jar files. Additionally, commands to ensure all shell scripts are executable have been reinstated, and the permission modification command has been adjusted to include *.sh. A directory creation command for ./editor and ./rts has been removed, while the overall structure, base image, and environment variables remain unchanged.

Changes

File Change Summary
Dockerfile - Changed && to -a for file existence checks.
- Reintroduced commands to ensure *.sh scripts are executable.
- Adjusted permission command to include *.sh.
- Removed directory creation for ./editor and ./rts.
- Maintained existing structure, base image, and environment variables.

Possibly related PRs

  • fix: False positive report GHSA-2jcg-qqmg-46q6 #37269: The changes in the Dockerfile related to executable permissions and script execution logic are relevant as they align with the modifications made in the main PR, which also focuses on executable permissions and script handling in the Dockerfile.

Suggested labels

Task

Suggested reviewers

  • pratapaprasanna

🎉 In the Dockerfile's dance, permissions take the lead,
With scripts now executable, fulfilling every need.
The checks are sharper, the paths are clear,
A tidy little build, bringing us good cheer!
🚀 Let's celebrate this code, with joy and delight,
For every little change, makes our project bright! 🌟


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 024a43b and 6c73943.

📒 Files selected for processing (1)
  • Dockerfile (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • Dockerfile

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>, please review it.
    • 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 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 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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 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.

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.

@sharat87 sharat87 added the ok-to-test Required label for CI label Nov 7, 2024
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: 1

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 359e395 and d23f861.

📒 Files selected for processing (1)
  • Dockerfile (2 hunks)
🔇 Additional comments (1)
Dockerfile (1)

20-23: LGTM! Correct usage of test operator.

The change from && to -a is appropriate here as it uses the proper POSIX test operator within the [ command.

Dockerfile Outdated Show resolved Hide resolved
@sharat87 sharat87 added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Nov 7, 2024
@github-actions github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Nov 7, 2024
Dockerfile Outdated Show resolved Hide resolved
@sharat87 sharat87 merged commit 15824af into release Nov 7, 2024
43 checks passed
@sharat87 sharat87 deleted the chore/fix-server-jar-check branch November 7, 2024 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Required label for CI skip-changelog Adding this label to a PR prevents it from being listed in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants