tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-31 11:14:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 22 Branches 289 Tags
Commit Graph

146 Commits

Author SHA1 Message Date
Marc van den Hoogen
c7cdd63acf Add shm_size to build-options (issue #3866) 
* Add shm_size to build configuration
 * Make it possible to enlarge/customize shm size during build
 * Value in bytes, or use string like "512M" or "1G" ...
 * Add to compose format 2.3 and (provisionally) >=3.5 format
 * Add automated test for shm_size in build-opts

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Made unit tests compatible with previously added shm_size build-option

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Also support shm_size build-opt when conf override

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Automated test for shm_size build-option

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Schema 3.4, add shm_size to schema 2.3, updated const.py

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Corrected typo in config_schema_v3.4

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Add support for g/m/k units for shm_size in build-opts

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Reorder imports in service.py

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
 2017-10-17 17:20:00 -07:00
Yong Wen Chua
16f8953c78 Add target to service build configuration 
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2017-08-21 13:09:19 -07:00
Joffrey F
d475e0c1e3 Add "network" field to build configuration 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Colin Hebert
3f920d515d Update tests to show labels set to None 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
bbdbc35924 Avoid rebinding tmpfs data volumes when recreating containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:40:42 -07:00
Joffrey F
5ea9167334 Prevent service to create a container if it is referencing itself in an external link 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-08 18:29:09 -08:00
Joffrey F
d5a2d37d05 Properly resolve build args against host environment values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-07 18:13:11 -08:00
Dat Tran
449dcc9d7b support --build-arg for build command 
Signed-off-by: Dat Tran <dattran.vn01@gmail.com>
 2017-03-07 17:09:35 -08:00
Joffrey F
dd4e49ef98 Merge pull request #4563 from shin-/3723-mem-reservation 
Add mem_reservation option to service config in 2.0 and 2.1 formats
 2017-03-07 15:23:22 -08:00
Joffrey F
ec252350ae Add mem_reservation option to service config in 2.0 and 2.1 formats 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 18:21:03 -08:00
Joffrey F
11788ef0ff Add support for expanded port syntax in 3.1 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-01 12:10:51 -08:00
Joey Payne
c64f7dde04 Fix failing unit tests 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Joffrey F
04e5925a23 Use docker SDK 2.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-14 15:36:08 -08:00
Joffrey F
efb09af271 Do not normalize volume paths on Windows by default 
Add environment variable to enable normalization if needed.
Do not normalize internal paths

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-18 12:17:56 -07:00
Daniel Nephin
56c6e29819 Unit test for skipping network disconnect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-15 16:28:59 -04:00
Danyal Prout
339ebc0483 Fixes #2096: Only show multiple port clash warning if multiple containers 
are about to be started.

Signed-off-by: Danyal Prout <me@dany.al>
 2016-04-12 20:58:21 +01:00
Daniel Nephin
83df95d511 Remove extra ensure_image_exists() which causes duplicate builds. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-08 15:21:12 -04:00
Aanand Prasad
c3eca82749 Merge pull request #3128 from dnephin/add_network_settings_to_config_hash 
Include network settings as part of the service config hash.
 2016-03-23 17:01:32 +00:00
Joffrey F
5826a2147b Use enum to represent 3 possible states of the one_off filter 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 12:12:52 +00:00
Daniel Nephin
089ec66522 Include network settings as part of the service config hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:20:03 -04:00
Daniel Nephin
e1b87d7be0 Update reference docs for the new flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 15:32:51 -05:00
Daniel Nephin
b7fb3a6d9b Add --build flag for up and create 
Also adds a warning when up builds an image without the --build flag
so that users know it wont happen on the next up.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 15:32:51 -05:00
Aanand Prasad
adb8de367e Merge pull request #2388 from dnephin/fix_long_lines 
Wrap long lines
 2016-02-25 16:52:33 -08:00
Daniel Nephin
d451578152 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:14:59 -08:00
Daniel Nephin
4f7530c480 Only set a container affinity if there are volumes to copy over. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-17 22:35:14 -05:00
Daniel Nephin
4a09da43ea Fix copying of volumes by using the name of the volume instead of the host path. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-17 13:34:14 -05:00
Daniel Nephin
57fc85b457 Wrap long lines and restrict lines to 105 characters. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-04 19:05:39 -05:00
Daniel Nephin
e551988616 Include networks in the config_hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:52:03 -05:00
Aanand Prasad
ed1b204804 Rename 'net' to 'network mode' in various classes/methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-25 23:55:20 +00:00
Aanand Prasad
ee63075a34 Support links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 14:34:26 +00: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
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
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
c8ed156806 Adding docker-compose down 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 10:59:53 -05: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
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
Daniel Nephin
fc57fc1dc1 Merge pull request #2609 from dnephin/dont_warn_on_container_volume 
Don't warn when the container volume is a compose option
 2016-01-08 17:18:02 -05:00
Dimitar Bonev
ed5f7bd394 log_driver and log_opt moved to logging key. 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-08 01:54:45 +02:00
Daniel Nephin
97fe2ee40c Don't preserve host volumes on container recreate. 
Fixes a regression after the API changed to use Mounts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Joffrey F
afab5c76ea Update service volume tests to use mounts key 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
ad9011ed96 Don't warn when the container volume is specified as a compose option. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 17:30:27 -05:00
Aanand Prasad
cfb1b37da2 Merge pull request #2405 from dnephin/move_all_validation_to_config 
Move all validation to config
 2015-11-25 15:16:21 +00:00
Daniel Nephin
e40670207f Add missing assert and autospec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-24 10:42:25 -05:00
Daniel Nephin
533f33271a Move service sorting to config package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:33:00 -05:00
Daniel Nephin
dac75b07dc Move volume parsing to config.types module 
This removes the last of the old service.ConfigError

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:33:00 -05:00
Daniel Nephin
068edfa313 Move parsing of volumes_from to the last step of config parsing. 
Includes creating a new compose.config.types module for all the domain objects.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:31:58 -05:00
Daniel Nephin
c9ca5e86b0 Remove project name validation 
project name is already normalized to a valid name before creating a service.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:30:54 -05:00
Daniel Nephin
e1308a8329 Fix extra warnings on masked volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-13 10:49:17 -05:00
Aanand Prasad
2063b39868 Merge pull request #2336 from dnephin/warn_on_volume_masking 
Add a warning when the host volume in the compose file is masked by a data volume
 2015-11-11 17:21:29 +00:00
Daniel Nephin
7365a398b3 Update doc wording for ulimits. 
and move tests to the correct module

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 15:03:20 -05:00