[18.09] Fix compose parser fails 3.4+ schema for volume

[diablodale]

Fixes #2272 on the 18.09 branch. If this PR is merged, I will submit two other identical PRs for the 18.06, 19.03, and master branches

- What I did

• Correct volume schema rule for compose 3.4+
• Discussion in issue compose parser fails 3.4+ schema for volume with external, driver, driver_opts, labels #2272 with details
• Added 4 unit tests

- How I did it

Added if conditional to only apply restrictive rule on < 3.4

- How to verify it

• make -f docker.Makefile test-unit to test this PR's fix
• See prior errant behavior in issue compose parser fails 3.4+ schema for volume with external, driver, driver_opts, labels #2272 repo steps
• Unable to e2e test due to issue (don't want github autolink) 2282

- Description for the changelog

fix compose 3.4+ schema rule to allow external volumes with driver, driver_opts, labels

- A picture of a cute animal (not mandatory but encouraged)

Photo by Kerin Gedge on Unsplash

[GordonTheTurtle]

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "fix-loadvol1" git@github.com:diablodale/cli.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354243712
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

[diablodale]

All (2) commits are already signed. GPG signatures in place and valid.

[thaJeztah]

The DCO check is checking if the commit message has a valid DCO sign-off, see the links in the comment that our bot (@GordonTheTurtle) left above.

Could you open this PR against the master branch? We generally merge changes into master first, and then backport/cherry-pick to release branches.

Note that 18.09 and older reached EOL, and only 19.03 is actively maintained

[codecov-io]

Codecov Report

Merging #2317 into 18.09 will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##            18.09    #2317      +/-   ##
==========================================
+ Coverage   54.28%   54.28%   +<.01%     
==========================================
  Files         291      291              
  Lines       19459    19461       +2     
==========================================
+ Hits        10563    10565       +2     
  Misses       8215     8215              
  Partials      681      681

[diablodale]

OK, its double signed (GPG and the text -s)
My primary number 1 is to get it on the 18.09 branch, see issue for details. If this is denied for the 18.09 branch, then this doesn't help my cause.
What is needed to get this fix into the 18.09 branch?

[thaJeztah]

I don't think this would be accepted for the 18.09 branch; is there a specific reason you need it for that version? (Given that 18.09 is no longer maintained?) Note that newer versions of the CLI can downgrade to older versions of the API, so should be fully compatible with older daemons.

I'm still trying to grasp the bug in this situation; "external" volumes mean that the specified volume should pre-exist (given that docker only looks up volumes by name, the "driver" should have no meaning there)

[diablodale]

Details are in the issue. I don't see a question from you not already discussed.

• reason for need is in issue (other project dependent on this project's library - not the EXE itself)
• code as is doesn't correctly implement docker-compose 3.4 schema. See details in issue

Happy to answer more, but I need to understand what you don't understand and isn't already written in the issue. :-)

[diablodale]

Exciting. Please do loop me in if I need to submit PRs for newer branches (or if your team cherry picks this into them).

[thaJeztah]

Looks like a spam bot leaving random reviews all over the place (My inbox is back to 1500 "participating" notifications, jay! 😣)

…

On 6 Nov 2020, at 17:20, Dale Phurrough ***@***.***> wrote:  Exciting. Please do loop me in if I need to submit PRs for newer branches (or if your team cherry picks this into them). — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or unsubscribe.