Victor Vieux
1e7c04fcfe
fix -rm
2013-11-22 11:23:48 -08:00
Mark Allen
8b0cd60019
Pass terminal setting to display utils
2013-11-22 00:05:55 -06:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
Michael Crosby
25e443a3c7
Merge pull request #2798 from dotcloud/fix_state_race
...
Refactor State to be 100% thread safe
2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe
2013-11-21 16:34:58 -08:00
Victor Vieux
8498b44eac
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
2013-11-21 15:33:05 -08:00
Victor Vieux
75a7f4d90c
Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr
2013-11-21 11:43:07 -08:00
Michael Crosby
a2c9d2da93
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-21 10:21:30 -08:00
Victor Vieux
f20c738963
Merge pull request #2793 from crosbymichael/offline-ids
...
Allow images to be saved and loaded by id and repository
2013-11-21 02:44:00 -08:00
Michael Crosby
fd7ab143bf
Allow images to be saved and loaded by id and repository
2013-11-20 17:28:19 -08:00
Andy Rothfusz
82cdd21a34
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
2013-11-20 16:30:48 -08:00
Michael Crosby
2bc35287a0
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
2013-11-20 11:10:13 -08:00
Michael Crosby
2382a0f920
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
2013-11-20 11:07:42 -08:00
Josh Poimboeuf
171d681724
resize pty after starting
...
Since ptyMaster is created during container start (startPty), it should
resized after starting, not before.
2013-11-20 11:40:30 -06:00
Frederick F. Kautz IV
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Josh Poimboeuf
440422a963
don't forward SIGCHLD to container
...
It makes no sense to forward SIGCHLD to the container.
2013-11-18 11:45:29 -06:00
Sven Dowideit
bc74f65068
make the docker commit help more copy&pasteable
2013-11-16 21:11:34 +10:00
Sven Dowideit
152459b727
add some common examples for docker images, and tell the user what -a filters out
2013-11-16 20:45:30 +10:00
Sven Dowideit
27159ce6ba
expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path
2013-11-16 20:15:04 +10:00
Alexander Larsson
243843c078
Print devicemapper status details in docker info
...
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.
The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
2013-11-15 11:04:02 +01:00
Alexander Larsson
062810caed
Show active driver in docker info output
2013-11-15 10:24:48 +01:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
2013-11-14 14:02:44 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
Victor Vieux
388057f11a
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
2013-11-12 14:40:17 -08:00
Guillaume J. Charmes
08623dc216
Fix ImageTree test
2013-11-12 12:25:35 -08:00
Victor Vieux
dcc9980550
Merge pull request #2657 from dotcloud/fix_docker_images_output
...
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-12 11:01:29 -08:00
Victor Vieux
b314f19db8
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
2013-11-12 10:19:29 -08:00
Michael Crosby
5d9723002b
Allow drivers to implement ApplyDiff in Differ interface
2013-11-11 19:09:57 -08:00
Victor Vieux
e2ac0e6b80
add wait, stop, start, restart, rm, rmi
2013-11-11 14:47:23 -08:00
Victor Vieux
84a3600ea8
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-11 13:54:17 -08:00
Guillaume J. Charmes
8149439d95
Make sure docker kill exit with failure in case of error
2013-11-11 09:15:51 -08:00
David Sissitka
5957dd9091
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
2013-11-08 00:15:19 -06:00
Guillaume J. Charmes
ef57752bce
Deprecate old tagging format
2013-11-07 17:30:51 -08:00
Sven Dowideit
01fea3cf11
Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
2013-11-08 09:32:13 +10:00
Andy Rothfusz
807a305f36
Merge pull request #1794 from justone/add-images-tree
...
add -tree option to images
2013-11-06 16:12:36 -08:00
Guillaume J. Charmes
45aba3dc95
Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change
...
change ID to CONTAINER ID/IMAGE ID
2013-11-06 09:45:23 -08:00
Nate Jones
b7d1d35c27
add image size to -tree
2013-11-06 04:23:07 +00:00
Nate Jones
ec9a9a08b8
implement "images -tree"
2013-11-06 03:58:16 +00:00
Nate Jones
2a5998baf1
move "images -viz" to client
2013-11-06 03:58:15 +00:00
Nate Jones
15867ff430
rework images JSON
2013-11-06 03:58:15 +00:00
Andy Rothfusz
962a66cd36
Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
...
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
2013-11-05 10:29:54 -08:00
Victor Vieux
a482bfd715
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
2013-11-04 16:14:14 -08:00
Victor Vieux
854cc5f559
remove column size hack
2013-11-04 15:34:51 -08:00
Victor Vieux
1f44fd8624
Fix logs with tty
2013-11-04 12:19:20 -08:00
Sven Dowideit
b840b73b08
tiny table heading tweak for #2149 - change ID to CONTAINER ID/IMAGE ID or IMAGE (the later if it could be an ID or a repo:tag
2013-11-04 22:10:51 +10:00
Sven Dowideit
1f3cdc11ee
conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG)
2013-11-04 22:07:55 +10:00
Victor Vieux
fc45535197
Merge pull request #2503 from dotcloud/2500-inspect-fix
...
Client: Inspect fix
2013-11-01 15:24:05 -07:00
Victor Vieux
8f27e23b4b
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
2013-11-01 15:21:47 -07:00
Victor Vieux
747967b4a4
rebase and add some filters
2013-10-31 19:25:55 -07:00
Victor Vieux
02b5202432
update docker search to reflect future changes of the api
2013-10-31 19:14:11 -07:00
Victor Vieux
a89a98e594
fix inspect error message
2013-10-31 18:50:58 -07:00
Victor Vieux
40ed10cc32
fix inspect when it returns nothing valid
2013-10-31 18:39:44 -07:00
Michael Crosby
96d1e9bb5a
Move archive.go to sub package
2013-10-31 16:57:45 -07:00
Victor Vieux
4b8a176ee0
Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
...
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
2013-10-30 18:57:07 -07:00
Travis Cline
1099d172a2
Add flags to history, add size flag
2013-10-30 19:41:20 -05:00
Victor Vieux
fb4672c52c
do not split last column docker top
2013-10-29 19:03:41 -07:00
Victor Vieux
700a71e6b6
stop proxy at one point
2013-10-29 14:29:01 -07:00
Victor Vieux
e0b59ab52b
Enable sig-proxy by default in run and attach
2013-10-29 11:18:34 -07:00
Sven Dowideit
82f1514895
docker stop sends SIGTERM and SIGKILL, docker kill sends SIGKILL
2013-10-29 13:37:43 +10:00
Michael Crosby
b038b0cd44
Merge pull request #2162 from dotcloud/links
...
Links and Container Naming
2013-10-28 19:24:10 -07:00
Michael Crosby
0d2924408b
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
2013-10-28 18:09:08 -07:00
Victor Vieux
d5c7e92a9a
fix docker ps display
2013-10-25 17:36:23 -07:00
Victor Vieux
13c521526d
only pass stdin to hijack when needed
2013-10-25 17:17:33 -07:00
Victor Vieux
66a159342b
update docker port command
2013-10-25 15:13:25 -07:00
Victor Vieux
6c863b49ef
remove docker ls and add docker link in usage and switch to go1.2rc2
2013-10-25 15:13:25 -07:00
Victor Vieux
256b7537e3
no more name encoding
2013-10-25 15:13:25 -07:00
Victor Vieux
387aeb78fb
refactor notrunc in commands.go to add names support
2013-10-25 15:13:24 -07:00
Alexander Larsson
d063c8d941
Move ListOps to utils submodule
...
This will be needed for later use in docker-init without a docker
dependency
2013-10-25 15:13:24 -07:00
Michael Crosby
515070d513
Remove docker ls from docs and cli usage
2013-10-25 15:13:24 -07:00
Michael Crosby
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Victor Vieux
31111f61e0
Merge pull request #1963 from rogpeppe/master
...
Client: Use less reflection in command-line method invocation
2013-10-24 18:03:20 -07:00
Victor Vieux
0e44864b66
change logic for tty resize to avoid warning in tests
2013-10-24 14:54:04 -07:00
Victor Vieux
656b66e51b
monitor the tty after starting the container
2013-10-24 11:19:06 -07:00
Victor Vieux
b0515a7016
Merge pull request #2279 from dotcloud/fix_docker_inspect
...
Client: improve docker inspect
2013-10-22 17:17:35 -07:00
Victor Vieux
01284cbf73
fix status code
2013-10-22 15:39:51 -07:00
Gurjeet Singh
7e09c6332d
Place 'top' subcommand's help in proper order.
2013-10-20 02:15:36 -04:00
Guillaume J. Charmes
9bceae2440
Add a chan to hijack() to block until the hijack is completed
2013-10-18 16:26:29 -07:00
Guillaume J. Charmes
e7269b9841
Fix issue with autoremove
2013-10-18 16:26:29 -07:00
Guillaume J. Charmes
3e014aa662
Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
2013-10-18 16:26:16 -07:00
Guillaume J. Charmes
333bc23f21
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
2013-10-18 16:19:27 -07:00
Guillaume J. Charmes
4918769b1a
Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
...
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
2013-10-18 16:16:29 -07:00
Roger Peppe
43fd85eb8f
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
commands.go
2013-10-18 09:22:20 +01:00
Victor Vieux
8bce284496
clean split between errors and output. JSON output always valid
2013-10-17 23:40:43 +00:00
Karl Grzeszczak
ad723bbfe7
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
2013-10-11 08:04:40 -05:00
Johan Rydberg
967010ae8c
Use correct auth config when logging in.
2013-10-08 06:46:29 +02:00
Michael Crosby
723de87681
Move run -rm to the cli only
2013-09-26 14:52:37 -07:00
Guillaume J. Charmes
f435970695
Merge pull request #1842 from dotcloud/split_stdout_stderr
...
* Runtime: Split stdout stderr
2013-09-26 18:05:24 -07:00
Victor Vieux
2fafe1efce
Merge pull request #1948 from dotcloud/fix_attach
...
Fix attach issue
2013-09-23 02:15:51 -07:00
Roger Peppe
181b9baddd
use less reflection in command line method invocation
2013-09-23 01:06:31 +01:00
Guillaume J. Charmes
2bd089dadb
Fix attach issue
2013-09-20 11:31:00 -07:00
David Sissitka
c6b4076125
Fixed HTTP imports.
2013-09-15 18:40:29 -07:00
Michael Crosby
b7a3fc687e
Add rm option to docker build to remove intermediate containers
2013-09-12 16:55:36 +00:00
Guillaume J. Charmes
e854b7b2e6
Make StdCopy works with huge amount of data
2013-09-11 14:49:33 -07:00
Guillaume J. Charmes
8ae5348a51
Split stdout stderr for non-tty commands
2013-09-11 14:48:22 -07:00
Victor Vieux
2801624462
Merge pull request #1796 from shin-/api_1_5
...
*Remote API: Bumped API version to 1.5
*Registry: Implement login with private registry
*Remote API: Improve port mapping information
2013-09-09 16:58:54 -07:00
Victor Vieux
46a1cd69a9
only os.Exits on error
2013-09-09 21:26:35 +00:00
Victor Vieux
9b088ada7e
Merge pull request #1812 from dotcloud/return-run-exit-code
...
*Client: Return the process exit code for run commands
2013-09-09 14:10:46 -07:00
Michael Crosby
3bc73fa21e
Return the process exit code for run commands
2013-09-05 23:54:03 +00:00
Victor Vieux
5ec2fea6dd
Detect images/containers conflicts in docker inspect
2013-09-05 22:31:17 +00:00
shin-
98a1314251
Merge branch 'mhennings-1357-implement-login-with-private-registry' into api_1_5
2013-09-04 22:27:04 +02:00
shin-
2ea52dddec
Merge branch 'better_api_ports' of git://github.com/shin-/docker into shin--better_api_ports
2013-09-04 22:25:01 +02:00
Marco Hennings
ded973219e
Move auth header on run cmd
2013-09-03 20:59:48 +02:00
shin-
dd4aab8411
Use base64 encoding
2013-09-03 20:59:48 +02:00
shin-
d04beb7f43
Pass auth config through headers rather than as URL param
2013-09-03 20:59:48 +02:00
Marco Hennings
ad322d7cca
Send corrent endpoint authentication when an image is pulled during the run
...
cmd.
2013-09-03 20:59:48 +02:00
Marco Hennings
da3bb9a7c6
Move authConfig to a Parameter on postImagePush, too
2013-09-03 20:59:48 +02:00
Marco Hennings
fcee6056dc
Login against private registry
...
To improve the use of docker with a private registry the login
command is extended with a parameter for the server address.
While implementing i noticed that two problems hindered authentication to a
private registry:
1. the resolve of the authentication did not match during push
because the looked up key was for example localhost:8080 but
the stored one would have been https://localhost:8080
Besides The lookup needs to still work if the https->http fallback
is used
2. During pull of an image no authentication is sent, which
means all repositories are expected to be private.
These points are fixed now. The changes are implemented in
a way to be compatible to existing behavior both in the
API as also with the private registry.
Update:
- login does not require the full url any more, you can login
to the repository prefix:
example:
docker logon localhost:8080
Fixed corner corner cases:
- When login is done during pull and push the registry endpoint is used and
not the central index
- When Remote sends a 401 during pull, it is now correctly delegating to
CmdLogin
- After a Login is done pull and push are using the newly entered login data,
and not the previous ones. This one seems to be also broken in master, too.
- Auth config is now transfered in a parameter instead of the body when
/images/create is called.
2013-09-03 20:45:49 +02:00
Michael Crosby
d13c2ed24e
Merge pull request #1317 from calavera/login_signal
...
Exit from `docker login` on SIGTERM and SIGINT.
2013-09-03 11:16:05 -07:00
Thijs Terlouw
6380b42edb
Add 2 missing cli commands to docs (events + insert) and alphabetically order docker output
2013-09-03 16:35:22 +02:00
David Calavera
ce53e21ea6
Read the stdin line properly.
...
Load the auth config before it's used.
2013-09-01 16:12:07 -07:00
David Calavera
fa3266efa5
Merge branch 'master' into login_signal
...
* master: (23 commits)
Made calling changelog before run return empty. Fixes #1705 .
fix error in docker build when param is not a directory
Document FROM <image>:<tag> Dockerfile instruction.
Install Ubuntu raring backported kernel from official archives directly.
Updated "Use -> The Basics" to use ubuntu:12.10.
hide version when not available
added a Dockerfile which installs all deps and builds the docs.
Unable to find image error should print to stderr
remove message during tests
use init function
add TEST env var during tests and silenced parserun during tests
Update python_web_app.rst
Update remaining upstart scripts to wait for lxc-net
Fixed a minor syntax error.
Add privileged flag in documentation for container creation
Fix #1685 : Notes on production use. General installation cleanup.
Fix bash completion, remove have
added apt-key finger tip and fingerprint in ubuntu installation page
Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
Start docker after lxc-net to prevent ip forwarding race
...
2013-09-01 15:56:59 -07:00
Victor Vieux
d605e82bad
fix error in docker build when param is not a directory
2013-08-30 18:08:29 +00:00
Michael Crosby
74982bda32
Merge pull request #1738 from jonasi/error-to-stderr
...
Unable to find image error should print to stderr
2013-08-30 10:43:45 -07:00
Victor Vieux
e3b58d3027
hide version when not available
2013-08-30 00:46:43 +00:00
Isao Jonas
4ff649ce85
Unable to find image error should print to stderr
2013-08-29 18:25:11 -05:00
David Calavera
9f8e5a93b4
Use flag.StringVar to capture the command line flags.
2013-08-29 11:46:42 -07:00
David Calavera
b8a8962833
Simplify term signal handler.
2013-08-29 11:46:42 -07:00
David Calavera
f18889bf67
Print a new line after getting the password from stdin.
2013-08-29 11:46:41 -07:00
David Calavera
6e4a818ee6
Exit if there is any error reading from stdin.
2013-08-29 11:46:41 -07:00
David Calavera
2357fecc92
Stop making a raw terminal to ask for registry login credentials.
...
It only disables echo asking for the password and lets the terminal to handle everything else.
It fixes #1392 since blank spaces are not discarded as they did before.
It also cleans the login code a little bit to improve readability.
2013-08-29 11:46:41 -07:00
David Calavera
23dc52f528
Allow to generate signals when termios is in raw mode.
2013-08-29 11:45:04 -07:00
David Calavera
c3154fdf4d
Use a more idiomatic syntax to capture the exit.
2013-08-29 11:45:03 -07:00
David Calavera
f1d0625cf8
Exit from `docker login` on SIGTERM and SIGINT.
...
Fixes #1299 .
2013-08-29 11:45:03 -07:00
shin-
98018df078
More descriptive, easier to process container portmappings information in the API
2013-08-28 00:20:35 +02:00
jbbarth
d80b50d4b4
Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
...
As 'go fmt' doesn't support verifying files in multiple directories,
it's probably a good idea to run it on all '*.go' files from time to
time with something like this:
find . -name "*.go" | xargs dirname | sort -u | xargs -n 1 echo go fmt
2013-08-27 10:05:25 +02:00
Michael Crosby
b866254a19
Merge pull request #1636 from unclejack/1594-return_non_zero_when_encountering_error
...
1594 - return non-zero exit code if at least one container has failed to start
2013-08-26 13:20:31 -07:00
Kawsar Saiyeed
d8a18ea3ae
Display error if resource not specified
...
Display an error message if a container resource is not supplied to
'docker cp'.
Fixes error in #1661
2013-08-25 00:28:36 +01:00
unclejack
d1ad0e278d
return error if at least one container fails to start
...
This makes docker start exit with exit code 1 if at least one container
didn't start. This also prints an error at the end.
2013-08-23 20:14:06 +03:00
Guillaume J. Charmes
78a71b1273
Merge pull request #1587 from dotcloud/1559_improve_version
...
Improve version
2013-08-22 17:28:18 -07:00
Guillaume J. Charmes
f925edd12d
Merge pull request #1525 from griff/1503-fix
...
Don't read from stdout when only attached to stdin
2013-08-22 13:43:05 -07:00
Michael Crosby
12715c8ddc
Merge pull request #1609 from jpetazzo/release-docker-with-docker
...
Release docker with docker
2013-08-22 13:13:06 -07:00
Michael Crosby
326dadd224
Merge pull request #1565 from dotcloud/only_load_authconfig_when_needed
...
Load authConfig only when needed and fix useless WARNING
2013-08-22 11:10:16 -07:00
Michael Crosby
e0a7013836
Merge pull request #1576 from MatthewMueller/patch-1
...
updated default -H docs
2013-08-21 09:09:43 -07:00
Matt Mueller
215094903a
update help
2013-08-21 02:08:32 -07:00
Solomon Hykes
9087ef9a77
Move VERSION to a dedicated file to facilitate automated builds and releases
2013-08-20 19:32:37 -07:00
Victor Vieux
41973d41e9
fix typo
2013-08-20 11:52:37 +00:00
Victor Vieux
646afab28d
improve version
2013-08-19 12:07:49 +00:00
Victor Vieux
f6653c3fa5
Merge pull request #1553 from dotcloud/1540_fix_error_message
...
fix can't connect message with socket
2013-08-19 05:06:21 -07:00
Victor Vieux
18962d0ff3
load authConfig only when needed and fix useless WARNING
2013-08-19 11:42:38 +00:00
Matt Mueller
f409c11916
add to cli
2013-08-17 22:10:06 -07:00
Evan Phoenix
07a887032a
Show tag used when image is missing
2013-08-17 20:03:54 -07:00
Victor Vieux
62b45f0827
fix can't connect message
...
with socket
2013-08-15 13:48:08 +00:00
Brian Olsen
c7cda86e84
Don't read from stdout in hijack unless attached. Fixes #1503
2013-08-15 02:54:06 +02:00
Michael Crosby
84a0274885
Merge pull request #1249 from unclejack/507-add_sigterm_sigint_handling_to_docker_run
...
#507 - make docker run handle SIGINT/SIGTERM
2013-08-14 15:00:19 -07:00
Victor Vieux
3c9f9945c9
prevent crash when .dockercfg not readable
2013-08-14 10:26:18 +00:00
Michael Crosby
4947e32acb
Merged 0.5.3 hotfix release back to master
...
Conflicts:
api.go
commands.go
network.go
2013-08-13 23:47:29 +00:00
Victor Vieux
2ba1300773
remove checkIfLogged
2013-08-13 14:02:49 +00:00