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
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
be49867cab
builder: handle escapes without swallowing all of them.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 17:38:24 +00:00
9a03652d96
Cleanup docs Dockerfile, so it matches best practices.
...
Docker-DCO-1.1-Signed-off-by: Joseph Ferguson <joe@infosiftr.com> (github: yosifkit)
2014-10-27 09:35:27 -07:00
80d35c7fd0
Merge pull request #8782 from shuai-z/rm-clean
...
removed redundant Clean
2014-10-27 09:23:10 -07:00
15b6b7be01
Merge pull request #8770 from LK4D4/logrus_support
...
Logrus support
2014-10-27 09:05:24 -07:00
2b41736205
Merge pull request #8641 from vbatts/vbatts-archive_test_and_benchmark
...
archive: tests and benchmarks for hardlinks
2014-10-27 09:55:19 -04:00
ce407ccff4
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>
2014-10-26 13:55:29 +08:00
5631ffbdfd
Merge pull request #6992 from mschurenko/master
...
include --releasever=/ in mkimage-yum.sh
2014-10-25 02:03:32 -06:00
10d3315080
Merge pull request #8643 from jfrazelle/fix-amazon-linux-dist
...
Fix amazon linux dist
2014-10-24 19:26:27 -06:00
350e1b783d
Merge pull request #8321 from erikh/ui_save_output
...
docker save: Do not save to a terminal.
2014-10-24 19:37:14 -04:00
61f8001c23
Expose # of CPUs and memory available on docker info.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-10-24 15:56:37 -07:00
c681bea062
Merge pull request #8744 from erikh/empty_entrypoint_inheritance
...
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
2014-10-24 15:31:15 -07:00
ee7dd44c01
Mass gofmt
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:11:48 -07:00
b99dcb3c7e
Remove pkg/log
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:03:24 -07:00
b3b4043345
Use common logging in engine
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:03:24 -07:00
7c62cee51e
Use logrus everywhere for logging
...
Fixed #8761
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:03:06 -07:00
6229a36432
Vendor logrus logging framework
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-24 15:01:52 -07:00
d515590d15
Merge pull request #8325 from mwhudson/do-not-use-X
...
Stop using -X flag to set global variables
2014-10-24 17:30:45 -04:00
78075abf81
Merge pull request #8746 from aluzzardi/bump-api-v1.16
...
Bump API to v1.16.
2014-10-24 16:47:48 -04:00
665cd10d59
Merge pull request #8760 from jfrazelle/8745-output-log
...
Client should use go log package.
2014-10-24 13:13:30 -07:00
9094c19a6d
Merge pull request #8315 from dqminh/save-start-error
...
Save start error into State.Error when the container fails to start
2014-10-24 13:13:00 -07:00
a7aedca4a1
Client should use go log package.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-24 13:03:46 -07:00
ca6cc65609
Bump API to v1.16.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-10-24 11:25:44 -07:00
0fdf7839a2
archive: tests and benchmarks for hardlinks
...
Adding moar information, so benchmark comparisons can be moar
comparative.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-10-24 08:58:31 -04:00
c6f242b88f
Merge pull request #8722 from SvenDowideit/sven-cannot-bash
...
Add --dryrun to allow testing to the docs-release site, and then fix the...
2014-10-23 21:37:55 -04:00
8f79bd964f
Merge pull request #8695 from SvenDowideit/add-details-to-entrypoint-docs
...
Rewrite ENTRYPOINT documentation covering all the combinations with exam...
2014-10-23 21:37:36 -04:00
4bae6235c0
Add --dryrun to allow testing to the docs-release site, and then fix the double dollar mistake
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-24 11:36:07 +10:00
0e6242122d
Merge pull request #8671 from shuai-z/master
...
Port number 49153(BeginPortRange) would be returned twice, causing dupli...
2014-10-23 17:37:38 -07:00
Michael Crosby
Jessica Frazelle
Alexandr Morozov
Sven Dowideit
Michael Crosby
Jessie Frazelle
Tibor Vass
Erik Hollensbe
unclejack
Igor Dolzhikov
Victor Vieux
Josh Hawn
Joe Ferguson
shuai-z
Tianon Gravi
Andrea Luzzardi
Alexandr Morozov
James Turnbull
Victor Vieux
Vincent Batts
Sven Dowideit