Skip to content

Support for build arguments#2653

Merged
aanand merged 3 commits into
docker:masterfrom
shin-:Runscope-build-args
Jan 14, 2016
Merged

Support for build arguments#2653
aanand merged 3 commits into
docker:masterfrom
shin-:Runscope-build-args

Conversation

@shin-
Copy link
Copy Markdown

@shin- shin- commented Jan 14, 2016

Based on #2540

Resolved merge conflicts + small change to move legacy format handling in the appropriate method.

@dnephin
Copy link
Copy Markdown

dnephin commented Jan 14, 2016

Looks like there is a test failure

@aanand aanand added this to the 1.6.0 milestone Jan 14, 2016
Garrett Heel and others added 2 commits January 14, 2016 12:14
Allows 'build' configuration option to be specified as an
object and adds support for build args.

Signed-off-by: Garrett Heel <garrettheel@gmail.com>
Made invalid in v2 format
Doesn't break build config anymore

Signed-off-by: Joffrey F <joffrey@docker.com>
@shin- shin- force-pushed the Runscope-build-args branch 2 times, most recently from fb0ea0e to ddeaf24 Compare January 14, 2016 21:37
Comment thread compose/config/config.py Outdated
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you had deleted this in a previous rebase, right? Now that it's in the V1 function

@shin- shin- force-pushed the Runscope-build-args branch from ddeaf24 to 768a977 Compare January 14, 2016 22:37
Signed-off-by: Joffrey F <joffrey@docker.com>
@shin- shin- force-pushed the Runscope-build-args branch from 768a977 to 1ae57d9 Compare January 14, 2016 22:39
@aanand
Copy link
Copy Markdown

aanand commented Jan 14, 2016

LGTM

aanand added a commit that referenced this pull request Jan 14, 2016
@aanand aanand merged commit 47e53b4 into docker:master Jan 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants