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
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
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
cdd6e97910
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-24 00:23:25 +00:00
a71b2ec54a
Merge pull request #8737 from brahmaroutu/resize_uponstart_8728
...
Allowing resize tty to only work when container is started
2014-10-23 17:20:10 -07:00
a76c924e6a
Merge pull request #8453 from estesp/8444-create-bridge-error
...
Gracefully handle network bridge without IP association at startup
2014-10-23 17:00:21 -07:00
c7c620dd9f
finally, use code generation for INITSHA1 & INITPATH too
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 11:01:19 +13:00
85744a35de
use code generation for GITCOMMIT/VERSION too
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 10:58:39 +13:00
3e10b93106
Use code generation to set IAMSTATIC instead of -X
...
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
2014-10-24 10:56:51 +13:00
78a272ce14
Allowing resize tty to only work when container is started
...
Addresses #8728
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-10-23 21:31:34 +00:00
88e6693912
Merge pull request #8736 from crosbymichael/update-libcontainer-oct3
...
Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
2014-10-23 14:07:36 -07:00
1262b5f605
Gracefully handle network bridge without IP association at startup
...
Addresses #8444
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-10-23 16:19:12 -04:00
77dcab133c
Merge pull request #8735 from estesp/fix-test-timeout-on-drone
...
Up test timeout to 10s based on recent drone.io timeout failures
2014-10-23 13:02:34 -07:00
45c511fd5a
Merge pull request #8733 from estesp/error-string-http-status-fix
...
Fix error string mapping to HTTP response code to ignore case
2014-10-23 12:10:21 -07:00
291b84610f
Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-23 19:00:05 +00:00
ee17b93df9
Up test timeout to 10s based on recent drone.io timeout failures
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-10-23 14:30:39 -04:00
6589044b5b
Fix volume test using "find" to properly call find with /hello path
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-10-23 14:13:11 -04:00
8b40d385b5
Removed James' email address
...
Changed email address for abuse reports from James to abuse@
2014-10-23 10:54:40 -07:00
9b430f4ec1
Fix error string mapping to HTTP response code to ignore case
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-10-23 13:34:06 -04:00
1aa67071cb
Merge pull request #8550 from aluzzardi/f-meminfo
...
system: Add MemInfo utility.
2014-10-23 09:31:28 +03:00
2c2edabca5
added test, gofmtd
...
Signed-off-by: shuai-z <zs.broccoli@gmail.com>
2014-10-23 11:35:12 +08:00
9451cf39ef
Port number 49153(BeginPortRange) would be returned twice, causing duplication and potential errors.
...
If we first request port 49153 (BeginPortRange) explicitly, and later some time request the next free port (of same ip/proto) by calling RequestPort() with port number 0, we will again get 49153 returned, even if it's currently in use. Because findPort() blindly retured BeginPortRange the first run, without checking if it has already been taken.
Signed-off-by: shuai-z <zs.broccoli@gmail.com>
2014-10-23 10:49:33 +08:00
fb6ee865a9
save start error into State.Error
...
when a container failed to start, saves the error message into State.Error so
that it can be retrieved when calling `docker inspect` instead of having to
look at the log
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-10-22 22:42:37 -04:00
0390d04d8a
Rewrite ENTRYPOINT documentation covering all the combinations with examples.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-23 12:12:08 +10:00
5343ede602
Merge pull request #8718 from jfrazelle/run-redirect-test-fix
...
TestRunRedirectStdout kept failing with timed out.
2014-10-22 19:11:12 -07:00
bb3e33154d
Merge pull request #8673 from SvenDowideit/whats-docker-version
...
DOCKER_VERSION and docker-version havn't been implemented.
2014-10-22 19:03:54 -07:00
ba14ddf85b
Merge pull request #8708 from torstehu/fix-url
...
Correct url from github.com/dotcloud/docker{,-py}
2014-10-22 18:57:42 -04:00
Erik Hollensbe
Jessie Frazelle
Tibor Vass
shuai-z
Tianon Gravi
Alexandr Morozov
Alexandr Morozov
James Turnbull
Victor Vieux
Jessica Frazelle
Andrea Luzzardi
Vincent Batts
Sven Dowideit
Michael Crosby
Michael Hudson-Doyle
Srini Brahmaroutu
Phil Estes
Michael Crosby
Fred Lifton
unclejack
Daniel, Dao Quang Minh
Sven Dowideit