centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 00:08:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,600 Commits 54 Branches 28 Tags
4a8b2947caae7151db39a425e71f0f66dfd060ea
Commit Graph

82 Commits

Author SHA1 Message Date
Aanand Prasad
e777d08854 Merge pull request #1924 from dnephin/python3_fix_for_logs 
Fix `docker-compose logs` on python3
 2015-08-27 14:19:42 +01:00
Daniel Nephin
3a0153859a Resolves #1856, fix regression in #1645. Includes some refactoring to make testing easier. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 16:21:31 -04:00
Daniel Nephin
d2718bed99 Allow setting a one-off container name 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 13:33:03 -04:00
Daniel Nephin
9d9550c5b6 Fix log printing for python3 by converting everything to unicode. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 11:24:48 -04:00
Daniel Nephin
a348993d2c Remove two unused functions from cli/utils.py 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 16:55:29 -04:00
Daniel Nephin
71ff872e8e Update unit tests for stream_output to match the behaviour of a docker-py response. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:48:48 -04:00
Daniel Nephin
7e4c3142d7 Have log_printer use utf8 stream. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:47:06 -04:00
Daniel Nephin
809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -04:00
Daniel Nephin
59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Aanand Prasad
60ff4549c9 Merge pull request #1766 from funkyfuture/pause_unpause 
Adds pause and unpause-commands
 2015-08-24 16:10:22 +01:00
Frank Sachsenheim
227584b864 Adds pause and unpause-commands 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
Aanand Prasad
c699876617 Set log level to DEBUG when --verbose is passed 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-20 16:09:28 +01:00
Karol Duleba
ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 18:54:42 +01:00
Aanand Prasad
80d90a745a Make sure an exception in any iterator gets raised in the main thread 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/multiplexer.py
 2015-07-29 19:42:33 +01:00
Aanand Prasad
a9942b512a Wait for all containers to exit when running 'up' interactively 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad
27378704df Isolate STOP logic in multiplexer module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad
03c3d4c768 generator -> iterator 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad
118a389646 Update API version to 1.19 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 15:44:21 +01:00
Reilly Herrewig-Pope
fc203d643a Allow API version specification via env var 
Hard-coding the API version to '1.18' with the docker-py constructor will
cause the docker-py logic at
https://github.com/docker/docker-py/blob/master/docker/client.py#L143-L146
to always fail, which will cause authentication issues if you're using a
remote daemon using API version 1.19 - regardless of the API version of
the registry.

Allow the user to set the API version via an environment variable. If
the variable is not present, it will still default to '1.18' like it
does today.

Signed-off-by: Reilly Herrewig-Pope <reilly.herrewigpope@mandiant.com>
 2015-07-29 08:44:47 -04:00
Aanand Prasad
04a773f1c8 Deprecate --allow-insecure-ssl 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-23 10:56:21 +01:00
Aanand Prasad
38a6209acd Stop printing a stack trace when there's an error when pulling 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-21 11:07:20 +01:00
Aanand Prasad
ced94a3504 Make smart recreate the default 
Add --force-recreate flag to enable the old default behaviour of
recreating everything.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 11:28:02 +01:00
Aanand Prasad
9d0bbdf8dd Make scale timeout configurable, default to 10 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-16 16:39:38 +01:00
Aanand Prasad
ec8bf066ba Make sure up/restart/stop timeout is an int 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 16:56:39 +01:00
Erik Kristensen
7937611366 change 80 to 0 
Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
 2015-07-14 12:31:00 -06:00
Erik Kristensen
b7edb3ca9d do not wrap table cells 
Signed-off-by: Erik Kristensen <erik@erikkristensen.com>
 2015-07-14 12:30:42 -06:00
Aanand Prasad
e98caf5cf9 Show an error on 'run' when there are legacy one-off containers 
Also warn the user about the one-off containers in the standard error
message about legacy containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-06 14:45:17 +01:00
Daniel Nephin
bd554a6fea Fix race condition in docker-compose up. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-07-03 10:29:46 -04:00
Daniel Nephin
ae96fc0071 Support reading config from stdin. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-07-02 22:16:22 -04:00
Aanand Prasad
93372dd665 Fix 'docker-compose help migrate-to-labels' 
- Fix "No such command" error

- Add text from migration section of install docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-19 15:43:53 -07:00
Aanand Prasad
5b2a0cc73d Merge pull request #1406 from vdemeester/667-compose-port-scale 
Fixing docker-compose port with scale (#667)
 2015-06-15 10:58:44 -07:00
Daniel Nephin
06db577105 Move converge() to a test module, and use a short timeout for tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 17:18:27 -04:00
Travis Thieman
c24d5380e6 Extend up -t to pass timeout to stop running containers 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-06-14 16:45:28 -04:00
Vincent Demeester
a5fd91c705 Fixing docker-compose port with scale (#667) 
Fixes #667 and Closes #735 (taking over it)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-06-10 23:26:33 +02:00
Aanand Prasad
66af37b135 Merge pull request #1474 from aanand/fix-ssl 
Fix SSL "CERTIFICATE_VERIFY_FAILED" error
 2015-06-09 11:56:27 -04:00
Daniel Nephin
5578ccbb01 Merge pull request #1527 from aanand/remove-logging-on-run-rm 
Remove logging on run --rm
 2015-06-08 16:21:02 -04:00
Aanand Prasad
b6a7db787f Remove logging on run --rm 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 11:16:00 -04:00
Aanand Prasad
f59b43ac27 Fix duplicate logging on up/run 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 10:52:15 -04:00
Aanand Prasad
7d2a89427c Merge pull request #1466 from noironetworks/changing-scale-to-warning 
Modified scale awareness from exception to warning
 2015-06-04 16:21:01 +01:00
Aanand Prasad
c571bb485d Report Python and OpenSSL versions in --version output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:55:31 +01:00
funkyfuture
ae9d619d86 Add command for Docker-style version information 
This adds a command 'version' to show software versions information
like Docker does. In addition it includes:
- version of the docker-py-package
- Python-implementation and -version

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-05-28 00:51:10 +02:00
André Martins
ae63d35660 Modified scale awareness from exception to warning 
Signed-off-by: André Martins <martins@noironetworks.com>
 2015-05-26 23:59:45 +01:00
Aanand Prasad
276fee105b Merge pull request #1459 from bfirsh/update-description 
Update description of Compose
 2015-05-26 15:57:26 +01:00
Ben Firshman
91ceb33d5a Update description of Compose 
"Define and run multi-container applications with Docker"

Not just development environments, and "complex" is not clear and
not really true.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-05-26 15:42:55 +01:00
Aanand Prasad
0b4d9401ee Bail out immediately if there are legacy containers 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-26 11:53:51 +01:00
Aanand Prasad
0fdb8bf814 Refactor migration logic 
- Rename `migration` module to `legacy` to make its legacy-ness explicit

- Move `check_for_legacy_containers` into `legacy` module

- Fix migration test so it can be run in isolation

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 18:21:09 +01:00
Aanand Prasad
3080244c0b Rename migrate_to_labels -> migrate-to-labels 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 14:54:41 +01:00
Harald Albers
41315b32cb Fix #1426 - migrate_to_labels not found 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-19 16:37:50 +02:00
Aanand Prasad
ef4eb66723 Implement smart recreate behind an experimental CLI flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 18:39:18 +01:00
Aanand Prasad
3304c68891 Only set AttachStdin/out/err for one-off containers 
If we're just streaming logs from `docker-compose up`, we don't need
to set AttachStdin/out/err, and doing so results in containers with
different configuration depending on whether `up` or `run` were invoked
with `-d` or not.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 17:41:04 +01:00