Fix replacing "service:x" with "container:y" #10036
Merged
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 I did
As mentioned in #9055 (comment) and #9055 (comment),
updateServices()
gets called fromprepareRun()
with an array of all containers belonging to the project and taking only first one of them is wrong in general case. For this use case we should construct amap
from service name to ID of the first container belonging to that service. Thismap
is then used ro replaceservice:x
withcontainer:y
innetwork_mode:
,ipc:
andpid:
. This change should not break the second use case ofupdateServices()
when it is called fromupdateProject()
with an array of containers already filtered by service (as pointed out in #9055 (comment)). In this casemap
will contain only one pair and code will behave exactly like before - only replacing mentions of one particular service and leaving all otherservice:x
intact.Related issue
Fixes #9055.