Skip to content

Update FFmpeg image #2749

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
Apr 4, 2025
Merged

Update FFmpeg image #2749

merged 1 commit into from
Apr 4, 2025

Conversation

VietND96
Copy link
Member

@VietND96 VietND96 commented Apr 4, 2025

User description

Thanks for contributing to the Docker-Selenium project!
A PR well described will help maintainers to quickly review and merge it

Before submitting your PR, please check our contributing guidelines, applied for this repository.
Avoid large PRs, help reviewers by making them as simple and short as possible.

Description

Motivation and Context

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • I have read the contributing document.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

PR Type

Enhancement, Configuration changes


Description

  • Updated FFmpeg version and related tags in Makefile.

  • Added new Go module versions for JWT libraries in .ffmpeg/Dockerfile.

  • Patched Go dependencies in rclone to address CVEs.

  • Improved configuration for FFmpeg image build process.


Changes walkthrough 📝

Relevant files
Enhancement
Dockerfile
Add JWT library versions and patch Go dependencies             

.ffmpeg/Dockerfile

  • Added new arguments for JWT library versions.
  • Updated go.mod patching to include JWT libraries.
  • Enhanced rclone build process with updated dependencies.
  • +4/-0     
    Configuration changes
    Makefile
    Update FFmpeg version and tag configurations                         

    Makefile

  • Updated default FFmpeg version to 7.1.
  • Adjusted FFmpeg tag versions for consistency.
  • Refined FFmpeg build configuration.
  • +2/-2     

    Need help?
  • Type /help how to ... in the comments thread for any questions about Qodo Merge usage.
  • Check out the documentation for more information.
  • Signed-off-by: Viet Nguyen Duc <[email protected]>
    @VietND96 VietND96 merged commit 55240ca into trunk Apr 4, 2025
    27 of 29 checks passed
    @VietND96 VietND96 deleted the ffmpeg branch April 4, 2025 04:07
    Copy link

    qodo-merge-pro bot commented Apr 4, 2025

    PR Reviewer Guide 🔍

    Here are some key observations to aid the review process:

    ⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪
    🧪 No relevant tests
    🔒 No security concerns identified
    ⚡ Recommended focus areas for review

    Version Consistency

    The PR changes FFMPEG_VERSION from 7.1.1 to 7.1, which appears to be a downgrade. However, FFMPEG_TAG_VERSION is changed from ffmpeg-7.1.1.1.1 to ffmpeg-7.1. Verify if this version change is intentional and consistent with project requirements.

    FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1)
    FFMPEG_TAG_PREV_VERSION := $(or $(FFMPEG_TAG_PREV_VERSION),$(FFMPEG_TAG_PREV_VERSION),ffmpeg-7.1.1.1)
    FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1)
    Dependency Versioning

    The PR adds explicit version pinning for JWT libraries. Verify that the specified versions (v4.5.2 and v5.2.2) are the appropriate versions needed for security and compatibility with the rest of the codebase.

    ARG GOLANG_JWT_V4_VERSION="v4.5.2"
    ARG GOLANG_JWT_V5_VERSION="v5.2.2"

    Copy link

    qodo-merge-pro bot commented Apr 4, 2025

    PR Code Suggestions ✨

    Explore these optional code suggestions:

    CategorySuggestion                                                                                                                                    Impact
    Possible issue
    Fix version inconsistency

    There's a version inconsistency between the FFmpeg variables. The
    FFMPEG_TAG_PREV_VERSION is set to 7.1.1.1 while the other variables use 7.1.
    This inconsistency could cause build or versioning issues.

    Makefile [22-24]

     FFMPEG_VERSION := $(or $(FFMPEG_VERSION),$(FFMPEG_VERSION),7.1)
    -FFMPEG_TAG_PREV_VERSION := $(or $(FFMPEG_TAG_PREV_VERSION),$(FFMPEG_TAG_PREV_VERSION),ffmpeg-7.1.1.1)
    +FFMPEG_TAG_PREV_VERSION := $(or $(FFMPEG_TAG_PREV_VERSION),$(FFMPEG_TAG_PREV_VERSION),ffmpeg-7.1)
     FFMPEG_TAG_VERSION := $(or $(FFMPEG_TAG_VERSION),$(FFMPEG_TAG_VERSION),ffmpeg-7.1)
    • Apply this suggestion
    Suggestion importance[1-10]: 8

    __

    Why: The suggestion correctly identifies an important version inconsistency between FFmpeg variables. Aligning FFMPEG_TAG_PREV_VERSION with the other variables (changing from 7.1.1.1 to 7.1) ensures consistent versioning, which is critical for proper build functionality and version tracking.

    Medium
    • More

    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    1 participant