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 libfaketime build on arm/v7 #652

Merged
merged 2 commits into from
Feb 9, 2025
Merged

Conversation

Danielius1922
Copy link
Member

No description provided.

Copy link

coderabbitai bot commented Jan 31, 2025

Walkthrough

The pull request updates multiple Dockerfiles for the cloud server applications by changing the base image version from alpine:3.20 to alpine:3.21. It introduces a new section for installing libfaketime, which includes checking out a specific commit from the repository. Previous installation commands for libfaketime have been removed, while the overall structure for copying files and setting up the working directory remains unchanged. Additionally, conditional compilation options for ARM architectures have been added to the CMake configuration for mbedTLS.

Changes

File Change Summary
docker/apps/Dockerfile.cloud-server Updated base image version from alpine:3.20 to alpine:3.21 and added installation commands for libfaketime, including repository cloning and compilation, while removing previous installation commands.
docker/apps/Dockerfile.cloud-server-debug Added a specific commit checkout for libfaketime during installation, ensuring a consistent version is used.
docker/apps/Dockerfile.cloud-server-debug-clang Introduced a specific commit checkout for libfaketime during installation, enforcing the use of a particular version.
docker/apps/Dockerfile.dps-cloud-server-debug Added a specific commit checkout for libfaketime during installation, specifying the version to be used.
deps/mbedtls.cmake Introduced conditional compilation options for ARM architectures, adding a specific compiler option to suppress a warning for GCC under defined conditions.

No sequence diagram is necessary for this change, as the modifications are purely structural and do not alter the control flow or introduce new functionality.


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

@ocf-conformance-test-tool
Copy link

🎉 Thank you for your code contribution! To guarantee the change/addition is conformant to the OCF Specification, we would like to ask you to execute OCF Conformance Testing of your change ☝️ when your work is ready to be reviewed.


ℹ️ To verify your latest change (bb5c209), label this PR with OCF Conformance Testing.

⚠️ Label is removed with every code change.

@Danielius1922 Danielius1922 force-pushed the adam/hotfix/fix-docker-images branch 6 times, most recently from a39dc40 to 4f36981 Compare February 1, 2025 09:14
@Danielius1922 Danielius1922 force-pushed the adam/hotfix/fix-docker-images branch from 4f36981 to 8616090 Compare February 9, 2025 10:05
Copy link

sonarqubecloud bot commented Feb 9, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
1 Security Hotspot

See analysis details on SonarQube Cloud

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

🧹 Nitpick comments (1)
deps/mbedtls.cmake (1)

71-81: LGTM! Well-structured fix for ARM builds.

The conditional compilation options are well-implemented and properly documented. The solution correctly targets the false positive array bounds warning in GCC ARM builds without affecting other architectures or compilers.

Consider enhancing the comment to include the GCC version where this issue was observed, which would help future maintainers understand if newer GCC versions still need this workaround:

-    # there is a false positive in ctr_drbg.c when built with default arm64 gcc
+    # there is a false positive in ctr_drbg.c when built with default arm64 gcc (observed in GCC <version>)
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8616090 and 08b13e7.

📒 Files selected for processing (1)
  • deps/mbedtls.cmake (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (37)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build-and-push-images (cloud-server-debug, Debug, docker/apps/Dockerfile.cloud-server-debug) / build-and-push-image
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build-and-push-images (cloud-server-debug, Debug, docker/apps/Dockerfile.cloud-server-debug) / build-and-push-image
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: build-and-push-images (cloud-server, Release, docker/apps/Dockerfile.cloud-server) / build-and-push-image
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build-and-push-images (cloud-server-debug, Debug, docker/apps/Dockerfile.cloud-server-debug) / build-and-push-image
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: build-and-push-images (cloud-server, Release, docker/apps/Dockerfile.cloud-server) / build-and-push-image
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1 MBEDTLS_FORCE_3_5_0=1)
  • GitHub Check: build-and-push-images (cloud-server-debug, Debug, docker/apps/Dockerfile.cloud-server-debug) / build-and-push-image
  • GitHub Check: build_esp32 (-DSDKCONFIG_DEFAULTS="sdkconfig.defaults;hawkbit/sdkconfig.defaults.hawkbit", true)
  • GitHub Check: build-and-push-images (cloud-server, Release, docker/apps/Dockerfile.cloud-server) / build-and-push-image
  • GitHub Check: make_linux_java (CLOUD=1 DEBUG=1)

@Danielius1922 Danielius1922 marked this pull request as ready for review February 9, 2025 11:37
@Danielius1922 Danielius1922 merged commit 238a4e4 into master Feb 9, 2025
48 of 142 checks passed
@Danielius1922 Danielius1922 deleted the adam/hotfix/fix-docker-images branch February 9, 2025 11:37
@github-actions github-actions bot locked and limited conversation to collaborators Feb 9, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant