2bfa151ffc
Merge pull request #8669 from monsterzz/8668-dualstack-registry
...
Use dual-stack Dialer when talking to registy
Upstream-commit: 565340c90c2e3402369224450807a047481d9efa
Component: engine
2014-10-29 12:03:12 -07:00
08749b6912
Merge pull request #8571 from ncdc/3631-stdout-premature-eof
...
Fix stdout premature EOF
Upstream-commit: f936a10d8048f471d115978472006e1b58a7c67d
Component: engine
2014-10-29 11:36:32 -07:00
708c2cf31e
Merge pull request #8846 from LK4D4/fix_compilation
...
Fix compilation issue bringed by #8319
Upstream-commit: 006d2334d1e5eb7d29d16290b20ae376d8b1beb8
Component: engine
2014-10-29 12:50:53 -04:00
28bd6d74bf
Fix compilation issue bringed by #8319
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 4da25724248d988771c2a546aa065505ceb24038
Component: engine
2014-10-29 09:31:35 -07:00
0a96e49cc3
Merge pull request #8319 from MalteJ/ipv6-ipallocator
...
Implementing IPv6 functionality for ipallocator
Upstream-commit: fd19e473fc81c8b58d82b1b77cd992c43faa64a8
Component: engine
2014-10-29 09:20:52 -07:00
ff26af6419
Merge pull request #8790 from cloojure/patch-2
...
Update faq.md
Upstream-commit: 7d538542ca53488f32db377984b7917480d60917
Component: engine
2014-10-28 19:55:00 -07:00
648f649fec
Merge pull request #8808 from nhsiehgit/dockerfiletut
...
changed dockerfile back button to look nicer
Upstream-commit: f1ddda6cf735e214a3980a000b1cbfb0d893e38a
Component: engine
2014-10-28 19:41:18 -07:00
631e8d7105
Merge pull request #8352 from zachborboa/patch-1
...
Fix typo
Upstream-commit: 290222c3ddbdfb871f7fa088b8c724b9970a75ba
Component: engine
2014-10-28 22:39:05 -04:00
54a35eb340
Merge pull request #8198 from jfrazelle/add-jessie-to-various-maintainers
...
Adding self to various maintainers files.
Upstream-commit: f0327c99dd6fb7353d76726e0adb67a1b5a98451
Component: engine
2014-10-28 19:35:28 -07:00
5a702f62c8
Merge pull request #8734 from alex/patch-2
...
Replace fast with quickly
Upstream-commit: e11dd26a6cbdbaa442fbf5eca6cb05270ed21ae6
Component: engine
2014-10-28 22:11:43 -04:00
1b7aca4d0a
Merge pull request #8646 from ndeloof/patch-3
...
Update docker_remote_api.md
Upstream-commit: 90221e28d61ed2a71ebbc8160d60156b8145dc43
Component: engine
2014-10-28 19:08:55 -07:00
088e4a75d9
Merge pull request #8750 from matm/patch-2
...
dockerimages.md: typo fix
Upstream-commit: 75ae54637778e98e06200d2a02afcab6902805aa
Component: engine
2014-10-28 22:04:43 -04:00
025009b453
Merge pull request #8762 from fredlf/tutorial-tweaks
...
Tweaks to Dockerfile tutorial
Upstream-commit: 01454a50cc3fe2bd5a86befa69427dc2bbaa604e
Component: engine
2014-10-28 22:04:23 -04:00
3b9414956c
Merge pull request #8836 from jfrazelle/hub-login-error
...
Fix error on successful login.
Upstream-commit: 9d65017069ff12fbf0a6f078ccf91bce42fc8ffb
Component: engine
2014-10-28 18:09:17 -07:00
fbef49310d
Fix error on successful login.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 35703d4f0c79e936bbff1804167ae9e8dde9b76c
Component: engine
2014-10-28 17:42:03 -07:00
e218058e35
Merge pull request #8833 from jfrazelle/revert-gccgo-changes
...
Revert gccgo changes
Upstream-commit: 674e11183a32d803d81d3a7bedee5ee96d7cb68a
Component: engine
2014-10-28 16:44:39 -07:00
08135c6c86
Revert "finally, use code generation for INITSHA1 & INITPATH too"
...
This reverts commit c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa.
Conflicts:
.gitignore
hack/make.sh
hack/make/dynbinary
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7041eb00be7d6224aeedf7db317667b1d121b54d
Component: engine
2014-10-28 16:29:01 -07:00
712adb4068
Revert "use code generation for GITCOMMIT/VERSION too"
...
This reverts commit 85744a35de0e30c2dd6741b833f38ff218c8a3fc.
Conflicts:
.gitignore
hack/make.sh
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ec1420cc2b228116d4aa9c812bd98fa8acdc1b98
Component: engine
2014-10-28 16:27:23 -07:00
5e6433dd55
Merge pull request #8717 from yosifkit/docs-dockerfile
...
Cleanup docs Dockerfile, so it matches best practices.
Upstream-commit: 321c85d03d925ceef7fc4ddec95f11b4133d8319
Component: engine
2014-10-28 16:25:50 -07:00
7c82a1653d
Revert "Use code generation to set IAMSTATIC instead of -X"
...
This reverts commit 3e10b93106dea94e5747ab32fe4ac765aa22f9bc.
Conflicts:
.gitignore
hack/make.sh
hack/make/dynbinary
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 17e0a15386c2a2ff01417d66e37683bd9a2a79c8
Component: engine
2014-10-28 16:25:50 -07:00
862c4beedc
Merge pull request #8828 from crosbymichael/update-libcontainer-oct4
...
Update libcontainer to f60d7b9195f8dc0b5d343abbc3293d
Upstream-commit: d176d1bfb4b59c5f1dcdebd42a8e22887ea1b80f
Component: engine
2014-10-28 16:14:28 -07:00
5243fb8cd6
Update libcontainer f60d7b9195f8dc0b5d343abbc3293d
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 622e1005530eada61675e533d3993d7df6c21186
Component: engine
2014-10-28 22:19:01 +00:00
ec0d91155f
Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
...
Expose # of CPUs and memory available on docker info.
Upstream-commit: eb1b785e67784ccc9b521566fbc1737d6177d9ad
Component: engine
2014-10-28 14:14:10 -07:00
3de9330fda
changed dockerfile back button to look nicer
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 7597f27276b1c47da05ad1ae0bbcca21e080d9a7
Component: engine
2014-10-28 11:52:49 -07:00
a8e026c677
Merge pull request #8806 from takama/ioreader
...
excluding unused transformation to []byte
Upstream-commit: 29ebb53b522436b9f405b36616a1eeec8b087d2b
Component: engine
2014-10-27 20:58:53 -04:00
b12f16ce86
Merge pull request #8807 from erikh/builder_docs
...
builder: Update documentation WRT environment replacement
Upstream-commit: 413f2efba10ac6036c14cf495e2fbb16c1462764
Component: engine
2014-10-27 17:40:09 -07:00
57b27c44c9
builder: Update documentation WRT environment replacement
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: e377716b377ccc4854f810bbfc3e65a7858163ed
Component: engine
2014-10-27 23:37:27 +00:00
4707072ff8
Merge pull request #8802 from jlhawn/vfs_copydir_use_archive_copywithtar
...
Use archive.CopyWithTar in vfs.Create
Upstream-commit: 039f2257680f31834aca655dca4ec93a25c2451c
Component: engine
2014-10-28 00:08:44 +02:00
f13fb51a8d
Merge pull request #8809 from erikh/builder_cmd_sh_fix
...
builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON
Upstream-commit: 55702ae3d6f0d09efc466134e62be909fd38d777
Component: engine
2014-10-27 18:07:08 -04:00
b3f73f86dd
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)
Upstream-commit: 24545c18c35620c211003561dc482d66ee6d0306
Component: engine
2014-10-27 21:50:22 +00:00
c86ba6b120
Merge pull request #8778 from erikh/builder_fixes
...
Builder: Environment replacement fixes
Upstream-commit: e590aa2c7adb1d221619fd3d11079a307827d463
Component: engine
2014-10-27 16:58:05 -04:00
092ea875c5
Merge pull request #8805 from vieux/update_sysinfo_to_logrus
...
update `pkg` to logrus
Upstream-commit: d42bcc065ad637dc41f348c37e50167aebb5b54a
Component: engine
2014-10-27 12:26:52 -07:00
5db49e8c8b
excluding unused transformation to []byte
...
Signed-off-by: Igor Dolzhikov <bluesriverz@gmail.com >
Upstream-commit: b65eb8d215576516b1d4bbb537968f08bbc8ff0e
Component: engine
2014-10-28 01:04:36 +06:00
1429a5fb4a
update sysinfo to logrus
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0a37f836adef969e9e5aa9ce7b2c465f9441c1a5
Component: engine
2014-10-27 18:59:02 +00:00
657fc47397
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)
Upstream-commit: b6db23cffe942b8d94c80d1e9b3f1f6fca87d139
Component: engine
2014-10-27 11:38:22 -07:00
5292cfbc42
Merge pull request #8743 from vieux/hostconfig_start
...
do not send hostconfig at start, as we do on create now
Upstream-commit: 339173dd5be7ec8807448f83622aa88561c445a6
Component: engine
2014-10-27 11:09:57 -07:00
8aa0b668bd
builder: whitelist verbs useful for environment replacement.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 4e74cd498b66e494b3336118a19c02000b282251
Component: engine
2014-10-27 17:38:25 +00:00
a3019fc24f
builder: handle escapes without swallowing all of them.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: be49867cab663b5bdcf7804f3d2504f056db9db1
Component: engine
2014-10-27 17:38:24 +00:00
b2f795f224
Cleanup docs Dockerfile, so it matches best practices.
...
Docker-DCO-1.1-Signed-off-by: Joseph Ferguson <joe@infosiftr.com > (github: yosifkit)
Upstream-commit: 9a03652d9614e9d0a816bab2d2c672236d2d3d23
Component: engine
2014-10-27 09:35:27 -07:00
d5e3aaa45d
Merge pull request #8782 from shuai-z/rm-clean
...
removed redundant Clean
Upstream-commit: 80d35c7fd0ca3a3c8d4dd4b4cd575048a9fbc092
Component: engine
2014-10-27 09:23:10 -07:00
6c8bda9fe4
Merge pull request #8770 from LK4D4/logrus_support
...
Logrus support
Upstream-commit: 15b6b7be010546f30d7eabd000167d428efc0b13
Component: engine
2014-10-27 09:05:24 -07:00
c6209d5ca3
Merge pull request #8641 from vbatts/vbatts-archive_test_and_benchmark
...
archive: tests and benchmarks for hardlinks
Upstream-commit: 2b4173620586853480c0977743550dbe8c2697b7
Component: engine
2014-10-27 09:55:19 -04:00
566532574e
Update faq.md
...
Minor language clarification.
Upstream-commit: 6e208b7f1c8130735018940ff95bf8b3662cab72
Component: engine
2014-10-26 19:57:52 -07:00
854a22f34f
removed redundant Clean
...
The doc (or src) says: The result is Cleaned.
http://golang.org/pkg/path/filepath/#Join
Signed-off-by: shuai-z <zs.broccoli@gmail.com >
Upstream-commit: ce407ccff4fb4245384e50d86870d2e247cd43ec
Component: engine
2014-10-26 13:55:29 +08:00
29c195c7fd
Merge pull request #6992 from mschurenko/master
...
include --releasever=/ in mkimage-yum.sh
Upstream-commit: 5631ffbdfd252c369d393e41ee86008ab2d7eb7c
Component: engine
2014-10-25 02:03:32 -06:00
36b26c05e8
Merge pull request #8643 from jfrazelle/fix-amazon-linux-dist
...
Fix amazon linux dist
Upstream-commit: 10d33150802d848c98adf256df81d949c83cf3cf
Component: engine
2014-10-24 19:26:27 -06:00
9609160b54
Merge pull request #8321 from erikh/ui_save_output
...
docker save: Do not save to a terminal.
Upstream-commit: 350e1b783d4deafbb62ede4d17df37dbaffa373a
Component: engine
2014-10-24 19:37:14 -04:00
e6c9b85c85
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
2014-10-24 15:56:37 -07:00
bd2b080653
Merge pull request #8744 from erikh/empty_entrypoint_inheritance
...
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
Upstream-commit: c681bea0620d24e9df370147a13a98f94bc66ee0
Component: engine
2014-10-24 15:31:15 -07:00
bad39206ea
Mass gofmt
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: ee7dd44c017458c8fe0be8e09569b1238366dca3
Component: engine
2014-10-24 15:11:48 -07:00
