Jessie Frazelle
51b26853ef
Merge pull request #7976 from duglin/Issue7902
...
Fix for issue 7902 - add trailing zeros to timestamps so logs align
2014-09-16 13:55:03 -07:00
Tianon Gravi
3ff8d45b35
Merge pull request #8070 from jfrazelle/exec-autocompletions
...
Add exec to autocompletions
2014-09-16 14:07:42 -06:00
Jessica Frazelle
c9c004d700
Add exec to autocompletions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-16 13:01:10 -07:00
Alexandr Morozov
00fd008170
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
2014-09-16 23:56:12 +04:00
Vincent Batts
0a6fd743ea
Merge pull request #8063 from jlhawn/tarsum_empty_tar_archive
...
tarsum: correct close and finish reads
2014-09-16 15:41:28 -04:00
Vishnu Kannan
c786a8ee5e
Adding docker exec support in CLI.
...
Fixed a bug in daemon that resulted in accessing of a closed pipe.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-16 19:24:25 +00:00
Tibor Vass
f88e2e8b99
Merge pull request #8054 from estesp/6830-fix-json-strings
...
Proper JSON handling of strings that could be represented as other types
2014-09-16 15:11:25 -04:00
Tibor Vass
28f09f0632
Merge pull request #8059 from estesp/8057-refactor-regexp-to-package-var
...
Refactor all pre-compiled regexp to package level vars
2014-09-16 15:04:23 -04:00
Phil Estes
1b0b1ec657
Proper JSON handling of strings that could be represented as other types
...
Addresses #6830
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-09-16 13:51:02 -04:00
Jessica Frazelle
23b2c39a40
Return errors in NewDaemonFromDirectory instead of calling Fatal
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-16 10:42:59 -07:00
Jessica Frazelle
67c254a60a
DisableNetworkBidge doesn't need to be public anymore
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-16 10:37:50 -07:00
Doug Davis
cd7a5f5c09
Fix for issue 7902.
...
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-16 10:28:37 -07:00
Phil Estes
4119c9d7d9
Refactor all pre-compiled regexp to package level vars
...
Addresses #8057
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2014-09-16 12:57:44 -04:00
Tibor Vass
23bb6513a0
Merge pull request #8026 from tonistiigi/validate-context-error-handling
...
Improve ValidateContextDirectory error handling.
2014-09-16 12:44:55 -04:00
Josh Hawn
bc956c6b79
Correct tarsum finish logic
...
Tarsum now correctly closes the internal TarWriter which appends
a block of 1024 zeros to the end of the returned archive.
Signed-off-by: Josh Hawn <josh.hawn@docker.com>
2014-09-16 09:34:21 -07:00
Tonis Tiigi
a8914293fb
Improve ValidateContextDirectory error handling.
...
- Errors sent to the walker callback functions were ignored. This meant that
one could get a panic when calling methods on a nil FileInfo object. For
example when the file did not exists any more.
- Lstat calls inside walker callback are reduntant because walker already calls
Lstat and passes the result to the callback.
- Error returned from filepath.Rel() can never be EACCES because it compares
strings and does not care about actual files.
- If Matched() returns error then ValidateContextDirectory() must return error.
Currently it still kept walking although the outcome was already known.
- Function will now fail in case of unknown error(not EACCES nor ENOENT).
Previous implementation did not make a clear decision about this (but
panicked because of the issues above).
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
2014-09-16 19:17:34 +03:00
unclejack
4da86f88a0
Merge pull request #5977 from vbatts/vbatts-tarsum_xattrs
...
tarsum: include xattr headers in to the checksum
2014-09-16 18:07:03 +03:00
James Turnbull
b645589071
Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere
...
Consistently use 'sudo docker' in examples
2014-09-16 08:43:58 -04:00
James Turnbull
b040ba99d0
Merge pull request #8060 from SvenDowideit/missing-t-in-get-api-eg
...
Added missing 't' from the end of the /images/{{id}}/get eg.
2014-09-16 08:43:26 -04:00
Sven Dowideit
4352ea7b0a
Added missing 't' from the end of the /images/{{id}}/get eg.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-16 15:27:44 +10:00
Tianon Gravi
0954fb32a4
Merge pull request #8013 from unclejack/fix_testimportdisplay
...
integ-cli: fix TestImportDisplay & add FileServer
2014-09-15 22:36:51 -06:00
Sven Dowideit
fc9a3b1c1b
Consistently use 'sudo docker' in examples
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-16 11:49:05 +10:00
Fred Lifton
023241614e
Merge pull request #8034 from michaljemala/patch-1
...
The default name of the bridge created is called 'docker0'.
2014-09-15 17:32:57 -07:00
Doug Davis
f013aa7f96
Add a timeout when trying to connect to the server, otherwise sometimes it just hangs
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-15 17:30:38 -07:00
Sven Dowideit
602dc6865b
Merge pull request #8030 from SvenDowideit/add-help-if-selinux-is-out-of-date
...
Help new users if their SELinux is not-upgraded yet.
2014-09-16 10:19:29 +10:00
Sven Dowideit
a3f51da98a
Help new users if their SELinux is not-upgraded yet.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-16 10:18:50 +10:00
Sven Dowideit
2f65ed0968
Merge pull request #8036 from unclejack/kernel_version_requirement
...
docs: change kernel version requirement
2014-09-16 10:14:02 +10:00
Sven Dowideit
62b86613e8
Merge pull request #8037 from unclejack/shrink_docs_images
...
docs: shrink images
2014-09-16 10:13:03 +10:00
Vishnu Kannan
39030382c4
Adding state to exec commands to prevent multiple starts of a single exec command.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 23:14:04 +00:00
Vishnu Kannan
bfebdfde78
Splitting the exec remote API into two separate APIs inorder to support resizing of tty sessions.
...
1. /container/<name>/exec - Creates a new exec command instance in the daemon and container '<name>'. Returns an unique ID for each exec command.
2. /exec/<name>/start - Starts an existing exec command instance. Removes the exec command from the daemon once it completes.
Adding /exec/<name>/resize to resize tty session of an exec command.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 22:56:47 +00:00
unclejack
9e5592d6a1
integ-cli: fix TestImportDisplay & add FileServer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-16 01:54:21 +03:00
Tibor Vass
8b18a2da54
Merge pull request #8051 from jfrazelle/image-tag-can-be-one-letter-test-update
...
Update integration-cli tests to allow one-letter tag as valid
2014-09-15 18:25:59 -04:00
Jessica Frazelle
985fae256f
Update integration-cli tests to allow one-letter tag as valid.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-15 15:17:50 -07:00
Jessie Frazelle
09982d0f97
Merge pull request #8049 from unclejack/fix_tag_validation
...
graph: validate tags properly & add unit tests
2014-09-15 14:32:02 -07:00
unclejack
ada883b198
graph: validate tags properly & add unit tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-16 00:13:54 +03:00
Fred Lifton
4b0bb71627
Merge pull request #8023 from nerab/patch-1
...
Append instead of replace file contents
2014-09-15 13:54:41 -07:00
Vincent Batts
0ecafb8a69
tarsum: version the addition of xattrs
...
Now that TarSum can be versioned, move the addition of xattr headers in
to the next version of TarSum
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-15 16:08:05 -04:00
Fred Lifton
c892423209
Merge pull request #8005 from SvenDowideit/document-sshd-env-vars
...
Document how to pass ENV vars to the user's shell
2014-09-15 12:44:56 -07:00
Fred Lifton
fd501d4b3a
Merge pull request #8044 from brahmaroutu/container_copy_6107
...
Change the copy command Content-Type header to x-tar
2014-09-15 12:06:48 -07:00
Vincent Batts
448c8ecb0f
tarsum: include xattr headers in to the checksum
...
this is to enhance the tarsum algorithm, but _MUST_ be done in lock step
with the same for docker-registry. (PR will be cited)
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-09-15 15:05:01 -04:00
Alexandr Morozov
fbae71326c
Merge pull request #8020 from erikh/rewrite_hosts_files
...
Links v2: Mutable network files
2014-09-15 23:03:30 +04:00
Srini Brahmaroutu
788e4acaa3
Change the copy command Content-Type header to x-tar
...
Addresses #6107
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-09-15 10:45:06 -07:00
Vishnu Kannan
0029180f7f
Removing 'exec' feature from the CLI until the docker daemon supports resizing of
...
tty sessions for exec'ed commands.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 17:06:07 +00:00
Vishnu Kannan
669561c2aa
Address review comments.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 17:00:00 +00:00
Vishnu Kannan
d980589de6
Adding integration tests for docker exec feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 16:59:59 +00:00
Vishnu Kannan
e1818d2a69
Update cli.md to include 'docker exec' feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 16:59:05 +00:00
Vishnu Kannan
d130c10ab7
Fix bug in attach handling for docker exec. Add docs for 'docker exec' feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 16:59:05 +00:00
Vishnu Kannan
e1cf95b593
Import nsenter in docker.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 16:59:05 +00:00
Vishnu Kannan
985d579586
Adding 'exec' command to remote API and CLI.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 16:59:03 +00:00
Vishnu Kannan
5130fe5d38
Adding support for docker exec in daemon.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 16:57:52 +00:00