Fix cli-plugins build.

[ijc]

Seems I rebased over b039db9 ("Make it possible to override the volume
mounts and shell for the dev container") at some point and failed to notice
that some of the variable names had changed.

Signed-off-by: Ian Campbell ijc@docker.com

[ijc]

I had a look to see if I should be tweaking the CI but it seems none of these targets (build, cross etc) are tested there -- the test-e2e which is run builds things internally to its own image and all the circle stuff is open coded in circle.yml rather than using the makefile targets. I won't look at this further here.

[codecov-io]

Codecov Report

Merging #1701 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1701   +/-   ##
=======================================
  Coverage   56.12%   56.12%           
=======================================
  Files         306      306           
  Lines       21030    21030           
=======================================
  Hits        11803    11803           
  Misses       8373     8373           
  Partials      854      854

[codecov-io]

Codecov Report

Merging #1701 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1701   +/-   ##
=======================================
  Coverage   56.18%   56.18%           
=======================================
  Files         306      306           
  Lines       21006    21006           
=======================================
  Hits        11803    11803           
  Misses       8349     8349           
  Partials      854      854

[ijc]

Looks like @silvin-lubecki also fixed in 2c6b2cc (#1698).

I rebased the switch to use $(DOCKER_RUN) and rewrote the commit message:

    Use `$(DOCKER_RUN)` for cli plugins build.
    
    Seems I rebased over b039db985a4b ("Make it possible to override the volume
    mounts and shell for the dev container") at some point and failed to notice
    that some of the variable names had changed.
    
    In the meantime the underlying issue was fixed in #1698 but here we switch to
    using `$(DOCKER_RUN)`. This means that these rules now use
    `$(DOCKER_RUN_NAME_OPTION)` and thus obey the `$(DOCKER_CLI_CONTAINER_NAME)`
    variable.
    
    Signed-off-by: Ian Campbell <ijc@docker.com>

Not sure if this is still valuable or not. Feel free to close or merge as you see fit.

[thaJeztah]

LGTM

[thaJeztah]

ping @silvin-lubecki @vdemeester @tiborvass PTAL

[vdemeester]

LGTM 🐯