centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-02 17:28:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,134 Commits 55 Branches 28 Tags
d6223371d68b1a88dda67ab47cfca902fcbb58d8
Commit Graph

28 Commits

Author SHA1 Message Date
Simon Herter
b8e0aed21c Show proper command in help text of build subcommand 
The help text of the build subcommand suggested to use 'compose build' (instead of 'docker-compose build') to rebuild images.

Signed-off-by: Simon Herter <sim.herter@gmail.com>
 2015-05-01 18:58:55 -04:00
Daniel Nephin
6c95eed781 Merge pull request #1269 from aanand/labels 
Implement 'labels' option
 2015-04-30 20:49:11 -04:00
Aanand Prasad
2e6bc078fb Implement 'labels' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 16:45:18 +01:00
Aanand Prasad
fed4377ef6 Merge pull request #1351 from mchasal/1301-alphabetize_usage 
Fix for #1301, Alphabetize Commands
 2015-04-29 14:21:46 +01:00
Daniel Nephin
a89bc304f6 Merge pull request #1075 from KyleJamesWalker/master 
Support alternate Dockerfile name.
 2015-04-27 10:06:43 -04:00
Michael Chase-Salerno
9a44708081 Fix for #1301, Alphabetize Commands 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-24 20:45:18 +00:00
Daniel Nephin
89789c54ad Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files 
Add parent directories search for default compose-files
 2015-04-24 13:12:24 -04:00
Kyle Walker
d17c4d27fa Support alternate Dockerfile name. 
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
 2015-04-24 08:30:36 -07:00
Aleksandr Vinokurov
ceff5cb9ca Add parent directories search for default compose-files 
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946.

Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com>
 2015-04-09 22:36:47 +00:00
Joseph Page
0b89ae6f20 [cli] run --rm overrides restart: always 
docker/compose#1013

Signed-off-by: Joseph Page <joseph.page@rednet.io>
 2015-03-30 14:45:24 +02:00
Aanand Prasad
965426e39b Revert "Add 'labels:' config option" 
This reverts commit 721327110d.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:04 -07:00
Aanand Prasad
721327110d Add 'labels:' config option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad
eef4bc3917 Specify all HostConfig at create time 
This is required for Swarm integration: the cluster needs to know
about config like `links` and `volumes_from` at create time so that it
can co-schedule containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:14:07 -07:00
Ben Firshman
8b5a882459 Merge pull request #867 from knutwalker/feature/timeout-flag 
Add timeout flag to stop, restart, and up
 2015-03-13 17:41:16 +00:00
Aanand Prasad
4ecf5e01ff Extract YAML loading and parsing into config module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:21:58 +00:00
Aanand Prasad
25c70c2af4 Merge pull request #1076 from gilclark/master 
Make volumes_from and net containers first class dependencies
 2015-03-13 11:46:13 +00:00
Ian VanSchooten
86b723e227 Provide user override option on command line 
Allows overriding a user on the command line from the one specified in
the docker-compose.yml

The added tests verify that a specified user overrides a default
user in the docker-compose.yml file.

Based on commit f2f01e207b491866349db7168e3d48082d7abdda by @chmouel

Signed-off-by: Ian VanSchooten <ian@badgelabsllc.com>
 2015-03-11 00:11:31 -04:00
Paul Horn
2534a0964f Add timeout flag to stop, restart, and up 
The commands `stop`, `restart`, and `up` now support a flag `--timeout`.
It represents the number of seconds to give the services to comply to
the command. In case of `up`, this is only relevant if running in
attached mode.

Signed-off-by: Paul Horn <knutwalker@gmail.com>
 2015-03-10 12:21:58 +01:00
Gil Clark
95f4e2c7c3 Make volumes_from and net containers first class dependencies and 
assure that starting order is correct.  Added supporting unit and
integration tests as well.

Signed-off-by: Gil Clark <gilclark1@gmail.com>
 2015-03-06 13:30:56 -08:00
Daniel Nephin
f47431d591 Resolves #927 - fix merging command line environment with a list in the config 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-03-02 10:23:43 -05:00
Aanand Prasad
db3b4731cd Merge pull request #1044 from usrenmae/py3-compat 
Move several steps closer to python3 compatibility
 2015-03-02 12:08:39 +00:00
Igor Ch
f1fc1d7a16 Move several steps closer to python3 compatibility 
Signed-off-by: Igor Ch <usrenmae@gmail.com>
 2015-02-28 23:26:20 +02:00
KingsleyKelly
fa195bc829 Add -f flag as option on rm. 
Signed-off-by: Kingsley Kelly <kingsley.kelly@gmail.com>
 2015-02-27 07:24:43 +00:00
Aanand Prasad
c39a0b0a2d Update pep8, fix errors and freeze requirements-dev.txt 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-11 19:00:13 +00:00
Aanand Prasad
7c087f1c07 Support fig.y(a)ml and show a deprecation warning 
Closes #864

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 13:14:44 -05:00
Aanand Prasad
16d6018419 Fix typos 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:28:49 +00:00
Aanand Prasad
620e29b63f Rename binary to docker-compose and config file to docker-compose.yml 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad
2af7693e64 WIP: rename Fig to Compose 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00