Skip to content

Security/trixie - #5

Merged
Mouette03 merged 4 commits into
mainfrom
security/trixie
Oct 2, 2026
Merged

Mouette03 merged 4 commits into
mainfrom
security/trixie

Conversation

@Mouette03

@Mouette03 Mouette03 commented Oct 2, 2026 •

Copy link
Copy Markdown
Owner

This pull request introduces support for selecting the Debian variant used in the PHP Docker image, with "trixie" (Debian 13) as the new default. It updates documentation, configuration files, Dockerfiles, and build scripts to allow easy switching between Debian versions. Additionally, it improves compatibility with "trixie" by handling specific package manager output and clarifies related documentation.

Debian variant support and configuration:

  • Added a debian_variant field to config.json and updated documentation in CONFIG_GUIDE.md to explain its usage and default to "trixie". Example configurations and explanations were updated accordingly. [1] [2] [3]
  • Updated dockerfile and dockerfile.template to use the debian_variant value in the base image tag, allowing dynamic selection between "trixie" and "bookworm". [1] [2]
  • Modified build scripts (generate_dockerfile.py and generate_dockerfile.ps1) to replace the %%DEBIAN_VARIANT%% placeholder based on the configuration, defaulting to "trixie" if not specified. [1] [2]

Compatibility and Dockerfile improvements:

  • Adjusted the package marking and cleanup logic in both dockerfile and dockerfile.template to ignore 'diversion by ...' lines produced by the merged-/usr changes in Debian "trixie", ensuring robust dependency handling. [1] [2] [3] [4]

Documentation updates:

  • Updated README.md to reflect the new default base image as php:8.3-apache-trixie.

Summary by CodeRabbit

  • Nouvelles fonctionnalités
    • La génération des images utilise désormais Debian Trixie par défaut. Vous pouvez choisir Bookworm comme variante alternative dans la configuration.
  • Documentation
    • Le guide de configuration et le README précisent la variante par défaut, l’option Bookworm et l’image PHP Apache correspondante.

…riant)

- Add debian_variant to config.json (default: trixie)
- Template uses php:<version>-apache-<debian_variant>
- Update Python/PowerShell generators and CONFIG_GUIDE
@coderabbitai

coderabbitai Bot commented Oct 2, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 3050f5ef-d2c8-41bd-8825-1cea63cdd489

📥 Commits

Reviewing files that changed from the base of the PR and between 7ffd859 and f65483b.

📒 Files selected for processing (7)
  • CONFIG_GUIDE.md
  • README.md
  • config.json
  • dockerfile
  • dockerfile.template
  • generate_dockerfile.ps1
  • generate_dockerfile.py
 ________________________________________________________________________________________________________________________
< I've finally learned what 'upward compatible' means. It means we get to keep all our old mistakes. - Dennie van Tassel >
 ------------------------------------------------------------------------------------------------------------------------
  \
   \   \
        \ /\
        ( )
      .( o ).
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.


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

Comment @coderabbitai help to get the list of available commands.

@Mouette03
Mouette03 merged commit 8a6f352 into main Oct 2, 2026
3 checks passed
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.

1 participant