Fix for Dockerfile conflict with sonar + agent and tools missing distros propagation #328
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.
Summary
Fixes issue with conflicting
Dockerfile
files on master. Sonar is creating Dockerfiles in the directory where new Dockerfile existed already. They were added here -> #289.Additionally another PR #267 made changes to how the agent images were built and especially to agent Dockerfile ARGs:
mongodb-kubernetes/docker/mongodb-agent/Dockerfile
Lines 3 to 6 in 89866b7
This conflicted with #303 where new
atomic_pipeline.py
was still depending on the old Dockerfile structure:mongodb-kubernetes/docker/mongodb-agent/Dockerfile
Lines 25 to 26 in 774bbac
Proof of Work
Passing CI (especially agent build task)
Checklist
skip-changelog
label if not needed