Merge Conflict Resolution (from 7.6.x to 7.7.x)#1318
Merged
Abhishek Krishna (abh1sh5k) merged 4 commits into7.7.xfrom Mar 5, 2026
Merged
Merge Conflict Resolution (from 7.6.x to 7.7.x)#1318Abhishek Krishna (abh1sh5k) merged 4 commits into7.7.xfrom
Abhishek Krishna (abh1sh5k) merged 4 commits into7.7.xfrom
Conversation
* upgradubg the python version
* upgradubg the python version
* Fixing the dependency
* Fixing the dependency
* Fixing the dependency
* Fixing the slash
* Fixing the confluent-docker-utils
* Removing python39 occurences
* Removing python39 occurences
* Fix Python 3.14 property reference and reorganize Dockerfile layers
- Fix build failure: Correct property reference from ${python314.version} to ${python.python314.version}
This addresses the reviewer's comment about following the python.*.version naming convention
- Reorganize Dockerfile into 4 clean layers with Python installed BEFORE Java:
1. Setup package manager and repositories
2. Install Python 3.14 from source (now before Java/system packages)
3. Install system packages and Java
4. Install Python packages and user setup
- Fix pip installation concerns:
- Remove unused PYTHON_PIP_VERSION ARG (pip now installed via --with-ensurepip)
- Add pip verification steps to ensure pip3 and python3 -m pip work correctly
- Add explanatory comment about pip installation method
- Remove debug scripts (check-pip-versions.sh, check-python-versions.sh)
This addresses all reviewer comments and ensures compatibility with downstream
Confluent Platform components (kafka, schema-registry, connect, etc.)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
* Fixing tar version issue
* Fixing build issue
* Fixing build issue
* Fixing build issue python alternative
* Fixing build issue python alternative
* Fixing build issue python alternative
* Fixing the dnf issue
* Fixing the dnf issue
* Fixing the dnf issue
* Adding SHA validation and comment fix
* updating tox version
* reverting tox version
* Adding alternative
* adding python version in service yml
* testing with alternatives
* testing with GPG key
* Using sigstore
* Using sigstore
* fixing alternatives
* Testing with python3.6
* Testing with python3.6
* Testing with python3.11
* Testing with python3.11
* Testing update-alternatives
* Testing update-alternatives
* Testing update-alternatives
* Testing update-alternatives
* Removing which command
* claenup stale pip
---------
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
- Keep 7.7.x additions: findutils, crypto-policies-scripts, zulu17 - Remove python39/pip version pinning (replaced by Python 3.14 from source) - Remove alternatives --set python (handled in Python 3.14 install layer) - Add missing FINDUTILS_VERSION and CRYPTO_POLICIES_SCRIPTS_VERSION ARGs Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Krish Vora (KrishVora01)
approved these changes
Mar 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is this pull request?
This is an autogenerated pull request by
pintdue to a merge conflict failure seen duringpint merge.Next Steps
pint mergeNOTE: "Create a merge commit" option must be used to ensure all commits from the head branch is added to the base branch.
Questions?
Please reach out to the Developer Productivity team on Slack at #devprod-eng or #devprod-oncall