[22.01] Fix container resolution for type="singularity" requirements

[bernt-matthias]

otherwise container_description.identifier = cache_path (at the end of the function) will modify the original (i.e. the tools) container description which influences i.e. (may break) successive container resolutions.

Bug occured only for containers of type="singularity" .. for explicit docker container requirements a copy was already created by dictifying and undictifying it.

How to test the changes?

(Select all options that apply)

• I've included appropriate automated tests.
• This is a refactoring of components with existing test coverage.
• Instructions for manual testing are as follows:
  1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

Found this while working on #15614 .. tests are coming.

License

• I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

[github-actions]

This PR was merged without a "kind/" label, please correct.

[mvdbeek]

otherwise container_description.identifier = cache_path (at the end of the function) will modify the original (i.e. the tools) container description which influences i.e. (may break) successive container resolutions.

thanks, as a minor comment I would put this as a comment above where you create the copy

[bernt-matthias]

thanks, as a minor comment I would put this as a comment above where you create the copy

Thanks for the feedback. I can do this. Should I open a new PR for this?

[mvdbeek]

Can you merge the release branches forward ? I think that'd be a good idea, but should be enough to just have this in dev

[bernt-matthias]

Can you merge the release branches forward ?

Never did this. Would this be just git merge release_22.01 while on dev?

[dannon]

@bernt-matthias One branch at a time; 22.01 -> 22.05, 22.05 -> 23.0, 23.0 -> dev.

[mvdbeek]

No, merge into 22.05, push, then merge that into 23.0, push, then merge that into dev