Remove PYTHON_VERSION from Docker image building #31483
Merged
Conversation
This file contains 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
As it's no longer needed now that we don't have Agent 6 on main
github-actions
bot
added
the
short review
alopezz
added
changelog/no-changelog
qa/done
chouquette
approved these changes
Nov 26, 2024
ewoodthomas
approved these changes
Nov 26, 2024
GustavoCaso
reviewed
Nov 26, 2024
Comment on lines
-90
to
-96
| && if [ "$PYTHON_VERSION" = "3" ]; then \ | ||
| rm -rf \ | ||
| opt/datadog-agent/embedded/bin/pip2* \ | ||
| opt/datadog-agent/embedded/bin/python2* \ | ||
| opt/datadog-agent/embedded/include/python2* \ | ||
| opt/datadog-agent/embedded/lib/*python2* || true ;\ | ||
| fi \ |
There was a problem hiding this comment.
I assume we no longer need to run this command because we no longer install Python, right?
github-actions
bot
added
medium review
|
/merge |
Devflow running:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 does this PR do?
Clean up references to PYTHON_VERSION when building Agent images.
Motivation
Cleanup, as it's no longer needed now that we don't have Agent 6 on main.
Describe how to test/QA your changes
Done with:
python-configlink was dropped, see below).ddev env run -a registry.ddbuild.io/ci/datadog-agent/agent:v49956016-d72dbc8d-7-amd64, etc.)Possible Drawbacks / Trade-offs
Additional Notes
The only difference in the files included in the image is that we lose the link of
python-config->python3-config. This should generally not be needed (more so given that a default python install won't attempt to create it).