79a77a396e
Wait for hijack on docker start command
...
With current implementation there was a possibility
that /start responds quicker than /attach, meaning that
some output would be clipped.
Fixed so the implementation matches with `docker run`.
This also fixes the flaky test results for TestCreateEchoStdout.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
2014-10-31 01:13:31 +02:00
c3762c3abf
Merge pull request #8822 from wilsaj/patch-2
...
Update host integration article
2014-10-30 12:19:36 -07:00
d0197f4f7e
Merge pull request #8856 from unclejack/reexec_pkg
...
pkg/reexec: move reexec code to a new package
2014-10-30 12:14:37 -07:00
9542ea7218
doc: Update host integration article
...
Update for changes in docker 1.2. Running the docker daemon with "-r=false" has been deprecated in favor of per-container restart policies.
Signed-off-by: wilsaj <wilson.andrew.j+github@gmail.com>
2014-10-30 13:39:45 -05:00
acd64278f1
pkg/reexec: move reexec code to a new package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-10-30 14:48:30 +02:00
b63a254522
Merge pull request #8747 from SvenDowideit/lets-tell-them-more-about-exec
...
Add a link to some documentation about exec.
2014-10-30 07:56:55 -04:00
74564e51ad
Merge pull request #8500 from fredlf/style-guide
...
Adds new Docs Style Guide.
2014-10-29 17:26:29 -07:00
461d33eeb0
Adds new Docs Style Guide.
...
Includes changes to mkdocs yml and removes style info from docs Read Me, adding a link instead.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Conflicts:
docs/README.md
Revisions to style guide based on review.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
More Style Guide revisions based on review.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
A few more style guide copy edits
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-10-29 16:43:58 -07:00
265a89a605
Merge pull request #8387 from vbatts/vbatts-registry_test_enpoint
...
registry/endpoint: make it testable
2014-10-29 13:36:17 -07:00
73057168fa
Merge pull request #8046 from vbatts/vbatts-archive_preserve_hard_links
...
archive: preserve hardlinks in Tar and Untar
2014-10-29 22:04:23 +02:00
565340c90c
Merge pull request #8669 from monsterzz/8668-dualstack-registry
...
Use dual-stack Dialer when talking to registy
2014-10-29 12:03:12 -07:00
f14a9ed011
archive: cleanup and more information
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2014-10-29 14:52:59 -04:00
f710a8d774
archive: example app for diffing directories
...
By default is a demo of file differences, but can be used to create a
tar of changes between an old and new path.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2014-10-29 14:52:59 -04:00
f9f8044363
archive: preserve hardlinks in Tar and Untar
...
* integration test for preserving hardlinks
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2014-10-29 14:52:52 -04:00
f936a10d80
Merge pull request #8571 from ncdc/3631-stdout-premature-eof
...
Fix stdout premature EOF
2014-10-29 11:36:32 -07:00
006d2334d1
Merge pull request #8846 from LK4D4/fix_compilation
...
Fix compilation issue bringed by #8319
2014-10-29 12:50:53 -04:00
4da2572424
Fix compilation issue bringed by #8319
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-29 09:31:35 -07:00
fd19e473fc
Merge pull request #8319 from MalteJ/ipv6-ipallocator
...
Implementing IPv6 functionality for ipallocator
2014-10-29 09:20:52 -07:00
7d538542ca
Merge pull request #8790 from cloojure/patch-2
...
Update faq.md
2014-10-28 19:55:00 -07:00
f1ddda6cf7
Merge pull request #8808 from nhsiehgit/dockerfiletut
...
changed dockerfile back button to look nicer
2014-10-28 19:41:18 -07:00
290222c3dd
Merge pull request #8352 from zachborboa/patch-1
...
Fix typo
2014-10-28 22:39:05 -04:00
f0327c99dd
Merge pull request #8198 from jfrazelle/add-jessie-to-various-maintainers
...
Adding self to various maintainers files.
2014-10-28 19:35:28 -07:00
e11dd26a6c
Merge pull request #8734 from alex/patch-2
...
Replace fast with quickly
2014-10-28 22:11:43 -04:00
90221e28d6
Merge pull request #8646 from ndeloof/patch-3
...
Update docker_remote_api.md
2014-10-28 19:08:55 -07:00
75ae546377
Merge pull request #8750 from matm/patch-2
...
dockerimages.md: typo fix
2014-10-28 22:04:43 -04:00
01454a50cc
Merge pull request #8762 from fredlf/tutorial-tweaks
...
Tweaks to Dockerfile tutorial
2014-10-28 22:04:23 -04:00
9d65017069
Merge pull request #8836 from jfrazelle/hub-login-error
...
Fix error on successful login.
2014-10-28 18:09:17 -07:00
35703d4f0c
Fix error on successful login.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-28 17:42:03 -07:00
674e11183a
Merge pull request #8833 from jfrazelle/revert-gccgo-changes
...
Revert gccgo changes
2014-10-28 16:44:39 -07:00
7041eb00be
Revert "finally, use code generation for INITSHA1 & INITPATH too"
...
This reverts commit c7c620dd9f
2014-10-28 16:29:01 -07:00
ec1420cc2b
Revert "use code generation for GITCOMMIT/VERSION too"
...
This reverts commit 85744a35de
2014-10-28 16:27:23 -07:00
321c85d03d
Merge pull request #8717 from yosifkit/docs-dockerfile
...
Cleanup docs Dockerfile, so it matches best practices.
2014-10-28 16:25:50 -07:00
17e0a15386
Revert "Use code generation to set IAMSTATIC instead of -X"
...
This reverts commit 3e10b93106
2014-10-28 16:25:50 -07:00
d176d1bfb4
Merge pull request #8828 from crosbymichael/update-libcontainer-oct4
...
Update libcontainer to f60d7b9195f8dc0b5d343abbc3293d
2014-10-28 16:14:28 -07:00
622e100553
Update libcontainer f60d7b9195f8dc0b5d343abbc3293d
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-28 22:19:01 +00:00
eb1b785e67
Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
...
Expose # of CPUs and memory available on docker info.
2014-10-28 14:14:10 -07:00
7597f27276
changed dockerfile back button to look nicer
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
2014-10-28 11:52:49 -07:00
29ebb53b52
Merge pull request #8806 from takama/ioreader
...
excluding unused transformation to []byte
2014-10-27 20:58:53 -04:00
413f2efba1
Merge pull request #8807 from erikh/builder_docs
...
builder: Update documentation WRT environment replacement
2014-10-27 17:40:09 -07:00
e377716b37
builder: Update documentation WRT environment replacement
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 23:37:27 +00:00
039f225768
Merge pull request #8802 from jlhawn/vfs_copydir_use_archive_copywithtar
...
Use archive.CopyWithTar in vfs.Create
2014-10-28 00:08:44 +02:00
55702ae3d6
Merge pull request #8809 from erikh/builder_cmd_sh_fix
...
builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON
2014-10-27 18:07:08 -04:00
24545c18c3
builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 21:50:22 +00:00
e590aa2c7a
Merge pull request #8778 from erikh/builder_fixes
...
Builder: Environment replacement fixes
2014-10-27 16:58:05 -04:00
d42bcc065a
Merge pull request #8805 from vieux/update_sysinfo_to_logrus
...
update `pkg` to logrus
2014-10-27 12:26:52 -07:00
b65eb8d215
excluding unused transformation to []byte
...
Signed-off-by: Igor Dolzhikov <bluesriverz@gmail.com>
2014-10-28 01:04:36 +06:00
0a37f836ad
update sysinfo to logrus
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-10-27 18:59:02 +00:00
b6db23cffe
Use archive.CopyWithTar in vfs.Create
...
The vfs storage driver currently shells out to the `cp` binary on the host
system to perform an 'archive' copy of the base image to a new directory.
The archive option preserves the modified time of the files which are created
but there was an issue where it was unable to preserve the modified time of
copied symbolic links on some host systems with an outdated version of `cp`.
This change no longer relies on the host system implementation and instead
utilizes the `CopyWithTar` function found in `pkg/archive` which is used
to copy from source to destination directory using a Tar archive, which
should correctly preserve file attributes.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2014-10-27 11:38:22 -07:00
339173dd5b
Merge pull request #8743 from vieux/hostconfig_start
...
do not send hostconfig at start, as we do on create now
2014-10-27 11:09:57 -07:00
4e74cd498b
builder: whitelist verbs useful for environment replacement.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 17:38:25 +00:00
Tonis Tiigi
Fred Lifton
Michael Crosby
Andy Wilson
unclejack
James Turnbull
Sven Dowideit
Victor Vieux
unclejack
Jessie Frazelle
Vincent Batts
Vincent Batts
Tibor Vass
Alexandr Morozov
Solomon Hykes
Jessica Frazelle
Alexandr Morozov
Michael Crosby
Nathan Hsieh
Erik Hollensbe
Igor Dolzhikov
Victor Vieux
Josh Hawn