Michael Crosby
08f1a91ccd
Merge pull request #7806 from erikh/fix_cmd_handling_in_parser
...
Fix cmd and entrypoint handling in parser
2014-09-11 10:42:22 -07:00
Jessie Frazelle
e550fc532c
Merge pull request #7984 from vbatts/vbatts-engine_env_comments
...
engine.Env: comments and tests for Get()
2014-09-11 10:19:58 -07:00
Erik Hollensbe
91bed43621
builder: Fix an error check being done at the wrong spot in run
...
dispatcher
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
576416c99a
move entrypoint integration-cli test for blank entrypoint to separate function
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
92f885d7bd
Do not populate path to prevent runconfig merge conflict; remove
...
autoConfig seeding of entrypoint.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
78a847a47a
evaluator: ensure entrypoint stays blank if set blank while CMD is set.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
ac107995ae
builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
3a6d1228a8
builder: Fix a small bug that could improperly cache.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
6b322ad2d3
builder/parser: fix handling of empty strings as the only argument.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Erik Hollensbe
234f0e4f79
builder/parser/dumper: Handle newlines appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-11 06:00:24 -07:00
Vincent Batts
6e0bc06018
engine.Env: comments and tests for Get()
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-10 22:20:49 -04:00
Sven Dowideit
2d1c8bd786
Merge pull request #7975 from passy/patch-2
...
Fix link for configuring automated builds
2014-09-11 09:16:41 +10:00
Michael Crosby
48fe9c1082
Merge pull request #7689 from vbatts/vbatts-tarsum_versioning
...
TarSum: versioning
2014-09-10 15:08:36 -07:00
Vincent Batts
747f89cd32
TarSum: versioning
...
This introduces Versions for TarSum checksums.
Fixes: https://github.com/docker/docker/issues/7526
It preserves current functionality and abstracts the interface for
future flexibility of hashing algorithms. As a POC, the VersionDev
Tarsum does not include the mtime in the checksum calculation, and would
solve https://github.com/docker/docker/issues/7387 though this is not a
settled Version is subject to change until a version number is assigned.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-10 15:41:52 -04:00
Pascal Hartig
ecbc8de249
Fix link for configuring automated builds
2014-09-10 21:08:05 +02:00
Michael Crosby
25f7840993
Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954
...
Deallocate port before trying to delete iptables chain
2014-09-09 17:41:26 -07:00
Michael Crosby
f9c345ddfa
Merge pull request #7897 from LK4D4/refactoring_net_mode
...
Add IsPrivate method for NetworkMode
2014-09-09 14:20:59 -07:00
Alexandr Morozov
080ca86191
Add IsPrivate method for NetworkMode
...
This method indicates that container using private network stack
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-10 00:46:43 +04:00
Alexandr Morozov
2e7cf6b0ce
Deallocate port before trying to delete iptables chain
...
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-10 00:40:46 +04:00
Vincent Batts
197f9b1e2b
Merge pull request #7921 from unclejack/increase_tarsum_buffer_size
...
pkg/tarsum: make buffer size dynamic
2014-09-09 16:10:02 -04:00
Michael Crosby
b5a4c70455
Merge pull request #7960 from vbatts/vbatts-tarsum_debugf_not_infof
...
tarsum: use Debugf, not Infof
2014-09-09 11:51:36 -07:00
Jessie Frazelle
2a832f617b
Merge pull request #7948 from SvenDowideit/add-more-port-specification-doc
...
add -p PORT as a valid format specification
2014-09-09 11:43:25 -07:00
Jessie Frazelle
971240696f
Merge pull request #7660 from rhatdan/selinux-volumes
...
Change default label of container volumes to shared SELinux Label
2014-09-09 11:16:19 -07:00
Vincent Batts
6a8cae3e03
tarsum: use Debugf, not Infof
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-09 14:07:20 -04:00
Jessie Frazelle
49c32189c0
Merge pull request #7958 from dqminh/fix-lxc-template-console
...
fix console attribute in lxc template
2014-09-09 11:00:48 -07:00
Daniel, Dao Quang Minh
4b3b54ca38
fix console attribute in lxc template
...
commit 4aa5da278f
moves `Console` from Command to
ProcessConfig, but missed the change in lxc_template. Therefore creating a
container with tty using lxc driver with fail with error
template: lxc:60:20: executing "lxc" at <.Console>: Console is not a field of
struct type struct { *execdriver.Command; AppArmor bool; ProcessLabel string; MountLabel string }
This changes lxc_console template to refers to `.ProcessConfig.Console`
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-09-09 13:51:13 -04:00
James Turnbull
1ed467a9ae
Merge pull request #7953 from SvenDowideit/reformat-api-docs
...
Reformat the API docs so I can read them
2014-09-09 12:52:26 -04:00
Jessie Frazelle
17314e2fe8
Merge pull request #7951 from taohu/typo
...
typo fix: immediatly -> immediately
2014-09-09 09:44:51 -07:00
Dan Walsh
73617e5e18
Change default label of container volumes to shared SELinux Label
...
Since these will be shared between containers we want to label
them as svirt_sandbox_file_t:s0. That will allow multiple containers
to write to them.
Currently we are allowing container domains to read/write all content in
/var/lib/docker because of container volumes. This is a big security hole
in our SELinux story.
This patch will allow us to tighten up the security of docker containers.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-09-09 08:18:20 -04:00
Sven Dowideit
f36dfbdcaf
Reformat the API docs so I can read them
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-09 16:17:38 +10:00
Hu Tao
fcc7ec8073
typo fix: immediatly -> immediately
...
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
2014-09-09 01:16:19 -04:00
Fred Lifton
f1095b801e
Merge pull request #7949 from SvenDowideit/remove-doubled-up-page-heading
...
Make the side bar about in-document navigation by removing the duplicated h1
2014-09-08 20:50:06 -07:00
Sven Dowideit
1f25bfea2d
Make the side bar about in-document navigation by removing the duplicated h1
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-09 11:44:51 +10:00
Sven Dowideit
e4d2a8231a
add -p PORT as a valid format specification
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-09 11:16:02 +10:00
Fred Lifton
bb8ea1fdc1
Merge pull request #7931 from jamtur01/device
...
Added --device flag to run reference
2014-09-08 14:33:56 -07:00
Fred Lifton
577066fb45
Merge pull request #7930 from jamtur01/nformat
...
Very minor formatting update for docs/sources/articles/networking.md
2014-09-08 14:28:29 -07:00
Fred Lifton
10e4ca760c
Merge pull request #7929 from SvenDowideit/doc-tar-stream
...
Sven Dowideit Update export, copy and build API to say 'TAR STREAM' for all versions.
2014-09-08 14:27:45 -07:00
Michael Crosby
85314e7e58
Merge pull request #7759 from unclejack/pull_latest_by_default
...
make docker pull only the latest tag by default
2014-09-08 13:43:21 -07:00
Tibor Vass
d7e29a2cc8
Merge pull request #7891 from tlipinski/master
...
Allows installation on Linux Mint Debian Edition
2014-09-08 14:44:07 -04:00
Jessie Frazelle
7bb5ec3be6
Merge pull request #7862 from Gandi/bugfixes/segfault-registry-session
...
Fix SEGFAULT if dns resolv error
2014-09-08 11:38:34 -07:00
Tomasz Lipinski
021722cf7a
Allows installation on Linux Mint Debian Edition
...
Otherwise platform won't be detected
Signed-off-by: Tomasz Lipinski <me@tlipinski.net>
2014-09-08 20:38:02 +02:00
Jessie Frazelle
f7429a2121
Merge pull request #7871 from vincentbernat/update/zsh-completion-1
...
zsh: update zsh completion for docker command
2014-09-08 11:25:55 -07:00
Tibor Vass
43eab4034b
Merge pull request #7938 from unclejack/make_run_test_verbose
...
integ-cli: increase verbosity for mem & cpu test
2014-09-08 14:10:58 -04:00
Michael Crosby
18edea2a6f
Merge pull request #7609 from ewindisch/max_imgname
...
Restrict length of repository names
2014-09-08 11:06:54 -07:00
Michael Crosby
11700512b9
Merge pull request #7920 from unclejack/fix_layer_permissions
...
ensure correct permissions are set for directories
2014-09-08 10:51:50 -07:00
unclejack
05a76477e6
integ-cli: increase verbosity for mem & cpu test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-08 20:46:45 +03:00
unclejack
cc5fb986b0
integ-cli: test correct directory permissions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-08 20:02:40 +03:00
Alexandr Morozov
2360d4a440
Merge pull request #7886 from jfrazelle/7047-json-line-delim
...
Fix line delimited JSON response
2014-09-08 20:47:21 +04:00
Jessica Frazelle
d2f75a3040
Fix line delimited JSON response
...
For GET /events, line delimit JSON.
Fixes #7047
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
2014-09-08 09:41:26 -07:00
Tibor Vass
68e07f3fa0
Merge pull request #7914 from jfrazelle/7802-backwards-compat-state
...
fixes #7802 , when api version 1.11 is `json.Marshal`ing the container st...
2014-09-08 12:39:55 -04:00