docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,249 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

571 Commits

Author SHA1 Message Date
Aanand Prasad 47e53b49c2 Merge pull request #2653 from shin-/Runscope-build-args 
Support for build arguments
 2016-01-14 23:13:54 +00:00
Joffrey F 1ae57d92d4 Remove duplicate functions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-14 14:39:06 -08:00
Joffrey F 13063a96cb Fix handling of service.dockerfile key 
Made invalid in v2 format
Doesn't break build config anymore

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-14 12:15:37 -08:00
Garrett Heel 9cfa71ceee Add support for build arguments 
Allows 'build' configuration option to be specified as an
object and adds support for build args.

Signed-off-by: Garrett Heel <garrettheel@gmail.com>
 2016-01-14 12:14:56 -08:00
Daniel Nephin 79df2ebe1b Support variable interpolation for volumes and networks sections. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 14:04:57 -05:00
Aanand Prasad d98b64f6e7 Remove duplicated logic from initialize_networks() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:09:45 +00:00
Aanand Prasad 4e61377c6d Move get_networks() out of Project class 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:01:44 +00:00
Aanand Prasad 73fbd01cfe Support the 'external' option for networks 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:00:39 +00:00
Aanand Prasad ca68c9faa4 Services can join 'bridge' or 'host' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:00:39 +00:00
Aanand Prasad e75629392d Don't join the bridge network by default in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:00:39 +00:00
Aanand Prasad 3eafdbb01b Connect services to networks with the 'networks' key 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +00:00
Aanand Prasad 35e347cf92 Disable the use of 'net' in v2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:37 +00:00
Aanand Prasad 69ed5f9c48 Specify networks in Compose file 
There's not yet a proper way for services to join networks

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 17:59:36 +00:00
Aanand Prasad 8fca4f1628 Merge pull request #2649 from dnephin/make_volumes_from_more_explicit 
Make volumes from more explicit in V2 config format
 2016-01-14 17:15:27 +00:00
Daniel Nephin 172b955d79 Merge pull request #2646 from dnephin/docker_compose_down 
docker-compose down
 2016-01-14 11:59:02 -05:00
Daniel Nephin b76dc1e05e Require volumes_from a container to be explicit in V2 config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:16 -05:00
Daniel Nephin c3968a439f Refactor config loading to move version check into ConfigFile. 
Adds the cached_property package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:45:15 -05:00
Daniel Nephin de949284f5 Refactor config loading for handling volumes_from in v2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:43:47 -05:00
Aanand Prasad dbe04a70f0 Merge pull request #2655 from shin-/updated_volume_definition 
Properly validate volume definition
 2016-01-14 16:37:39 +00:00
Daniel Nephin c64af0a459 Add an acceptance test and docs for the down subcommand 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:11:08 -05:00
Daniel Nephin c8ed156806 Adding docker-compose down 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 10:59:53 -05:00
Aanand Prasad 18df1e170d Merge pull request #2625 from kojiromike/allow-list-entrypoints 
Allow Entrypoints to be Lists
 2016-01-14 12:48:13 +00:00
Aanand Prasad 7733600262 Merge pull request #2508 from jstewmon/stop_signal 
add support for stop_signal to compose file
 2016-01-14 12:46:04 +00:00
Joffrey F e41e6c1241 Properly validate volume definition 
Test valid empty volume definitions

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 18:22:29 -08:00
Joffrey F 153185eadb Merge pull request #2647 from shin-/preexisting_volume_detection_rb1 
Support for external volumes
 2016-01-13 17:02:36 -08:00
Michael A. Smith 59a4ab9634 Allow Entrypoints to be Lists 
Signed-off-by: Michael A. Smith <msmith3@ebay.com>
 2016-01-13 17:45:56 -05:00
Joffrey F e76b2679eb external volume disallows other config keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 14:12:03 -08:00
Joffrey F c260eb910b Merge pull request #2629 from dbonev/2611-support-port-range-in-compose 
Port range in exposed ports
 2016-01-13 13:09:22 -08:00
Aanand Prasad 3aba5bb67e Merge pull request #2620 from dbonev/2607-ulimits-not-merged-in-extended-services 
Ulimits are now merged into extended services
 2016-01-13 21:05:38 +00:00
Joffrey F d601199eb5 Normalize external_name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 12:07:08 -08:00
Joffrey F 8616b2de51 Update error message when external volume is missing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 11:23:06 -08:00
Evgeniy Dobrohvalov bf48a781db Add flag for stops all containers if any container was stopped. 
Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
 2016-01-13 13:12:09 +03:00
Joffrey F 9cb58b796e Implement ability to specify external volumes 
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:53:49 -08:00
Joffrey F 05935b5e54 Don't recreate pre-existing volumes. 
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 15:42:42 -08:00
Jonathan Stewmon 5d8c2d3cec add support for stop_signal to compose file 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2016-01-12 17:21:49 -06:00
Dimitar Bonev 3a46abd17f Allowed port range in exposed ports 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-13 00:13:04 +02:00
Dimitar Bonev 2f07e2ac36 Ulimits are now merged into extended services 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-12 23:59:23 +02:00
Aanand Prasad 70cce961a8 Don't allow links or external_links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:45 +00:00
Aanand Prasad 9e17cff0ef Refactor API version switching logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:45 +00:00
Aanand Prasad a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00:00
Aanand Prasad 1a66543461 Make the default network name '{project name}_default' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Daniel Nephin e98ab0e534 Allow both image and build together. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 14:10:00 -05:00
Daniel Nephin ed4db542d6 Fix pep8 errors from the new pep8 release. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 14:02:30 -05:00
Daniel Nephin 12b5405420 Fix pre-commit on master. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 13:27:18 -05:00
Daniel Nephin 304a44aeab Merge pull request #2585 from dnephin/short_signal_handlers 
Fix signal handlers by moving shutdown logic out of handler
 2016-01-12 12:55:53 -05:00
Aanand Prasad 52e50a9d9a Merge pull request #2626 from shin-/dbonev-2503-move-logging-config-under-separate-key 
Move logging config under separate key in v2 compose files
 2016-01-12 15:21:10 +00:00
Aanand Prasad 063a25ae7d Merge pull request #2392 from dnephin/docker_compose_events 
docker-compose events
 2016-01-12 11:45:27 +00:00
Joffrey F 46a474ecd9 Move v1-v2 config normalization to separate function. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 15:53:28 -08:00
Joffrey F c32991a8d4 Remove superfluous service code 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 15:39:59 -08:00
Daniel Nephin d3cd038b84 Update event field names to match the new API fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-11 11:51:17 -05:00