ab21dc210b
use correct apt-key for test.docker.io/ubuntu
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 440eb7fee88791d4f2f0866b04ff15253b6df8e9
Component: engine
2014-09-11 15:22:36 -07:00
f59e13d587
Merge pull request #7202 from timbot/add-registry-mirror-flag
...
Add daemon flag to specify public registry mirrors
Upstream-commit: ed7fb3bbdaa5cbce2563567eaa4cef67fc172270
Component: engine
2014-09-11 11:11:01 -07:00
6a8c7d0e92
Merge pull request #7806 from erikh/fix_cmd_handling_in_parser
...
Fix cmd and entrypoint handling in parser
Upstream-commit: 08f1a91ccd39a880645d4dbe8a45173f17cf42fe
Component: engine
2014-09-11 10:42:22 -07:00
2d65e30419
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)
Upstream-commit: 91bed436215f272c2956abb969425ee0bfd3a998
Component: engine
2014-09-11 06:00:24 -07:00
665c625297
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)
Upstream-commit: 576416c99a0ae8ad27467f217ec21f598e4f4cc8
Component: engine
2014-09-11 06:00:24 -07:00
d8ce78da21
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)
Upstream-commit: 92f885d7bd9d4a8f5d30ec650a7625a8727d952e
Component: engine
2014-09-11 06:00:24 -07:00
b3a58e1095
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)
Upstream-commit: 78a847a47ac777f4090c06a82e875ee30f9a1cbd
Component: engine
2014-09-11 06:00:24 -07:00
76991d395e
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)
Upstream-commit: ac107995ae4a24195f8bb6b70c26393a87d19982
Component: engine
2014-09-11 06:00:24 -07:00
a3d374a131
builder: Fix a small bug that could improperly cache.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3a6d1228a83ba0f9dd96138ccccfa758c0956a62
Component: engine
2014-09-11 06:00:24 -07:00
35b33a60e1
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)
Upstream-commit: 6b322ad2d32b1525ad01611f0d6ad8d803f5f6f0
Component: engine
2014-09-11 06:00:24 -07:00
c4ae3304f1
builder/parser/dumper: Handle newlines appropriately.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 234f0e4f79c27a4820f75a504fdcd45b2981a68a
Component: engine
2014-09-11 06:00:24 -07:00
6556d7f015
engine.Env: comments and tests for Get()
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 6e0bc06018b28ac46689708343b8dd57cae772c2
Component: engine
2014-09-10 22:20:49 -04:00
68ab799b75
Merge pull request #7975 from passy/patch-2
...
Fix link for configuring automated builds
Upstream-commit: 2d1c8bd78647162c7ea7d6bf9390a3d56305eb2d
Component: engine
2014-09-11 09:16:41 +10:00
5f275ccb1b
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 >
Upstream-commit: 747f89cd327db9d50251b17797c4d825162226d0
Component: engine
2014-09-10 15:41:52 -04:00
024af24baa
Fix link for configuring automated builds
...
Upstream-commit: ecbc8de2496bb8399a06defb5adfd0860adad788
Component: engine
2014-09-10 21:08:05 +02:00
0d5a02c8f6
Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954
...
Deallocate port before trying to delete iptables chain
Upstream-commit: 25f7840993b9f4ae47b900fcbde67fcd86d537ee
Component: engine
2014-09-09 17:41:26 -07:00
765de5955d
Merge pull request #7897 from LK4D4/refactoring_net_mode
...
Add IsPrivate method for NetworkMode
Upstream-commit: f9c345ddfae25d5512b775968fb14ed1abb00504
Component: engine
2014-09-09 14:20:59 -07:00
53bdf11639
Add IsPrivate method for NetworkMode
...
This method indicates that container using private network stack
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 080ca8619172b020c7da29b46f2fe4c939bb47ca
Component: engine
2014-09-10 00:46:43 +04:00
73455edf0c
Deallocate port before trying to delete iptables chain
...
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 2e7cf6b0cec3e5cc6f05fa5011cf7b5e49a44ae4
Component: engine
2014-09-10 00:40:46 +04:00
1c4a4c9a65
Merge pull request #7921 from unclejack/increase_tarsum_buffer_size
...
pkg/tarsum: make buffer size dynamic
Upstream-commit: 197f9b1e2b5810bbbd38b95b1d68c586033fad7c
Component: engine
2014-09-09 16:10:02 -04:00
0b07be83cc
Add daemon flag to specify public registry mirrors
...
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.
Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com > (github: timbot)
Upstream-commit: 69a75c673ccf0aebf19c7b350243f1b0cefad8be
Component: engine
2014-09-09 19:03:38 +00:00
dabdac7095
Merge pull request #7960 from vbatts/vbatts-tarsum_debugf_not_infof
...
tarsum: use Debugf, not Infof
Upstream-commit: b5a4c70455019abe016d7880e0c01f1d1d7811ee
Component: engine
2014-09-09 11:51:36 -07:00
791c25051e
Merge pull request #7948 from SvenDowideit/add-more-port-specification-doc
...
add -p PORT as a valid format specification
Upstream-commit: 2a832f617bb7db65aa083d73f650cb1ad756da1a
Component: engine
2014-09-09 11:43:25 -07:00
114dd7f292
Merge pull request #7660 from rhatdan/selinux-volumes
...
Change default label of container volumes to shared SELinux Label
Upstream-commit: 971240696f3fd74ece726245afd60bca1f86ecbc
Component: engine
2014-09-09 11:16:19 -07:00
855ab1fce7
tarsum: use Debugf, not Infof
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 6a8cae3e03d7253f2013b6c56eef64b18aea038f
Component: engine
2014-09-09 14:07:20 -04:00
cf5c443ddd
fix console attribute in lxc template
...
commit 4aa5da278f49c889d43191f82ff42d3a95266d62 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)
Upstream-commit: 4b3b54ca388cd49cd790def66fbce9af2be2f20f
Component: engine
2014-09-09 13:51:13 -04:00
da00deba3a
Merge pull request #7953 from SvenDowideit/reformat-api-docs
...
Reformat the API docs so I can read them
Upstream-commit: 1ed467a9aeb5323dfd457cecbd83cd1b5ef0a1af
Component: engine
2014-09-09 12:52:26 -04:00
2a0b4ab45f
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)
Upstream-commit: 73617e5e18159e5f791d2860c7857cd5dea31be4
Component: engine
2014-09-09 08:18:20 -04:00
ec6681e63c
Reformat the API docs so I can read them
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: f36dfbdcaf54ed01721f0871c26fe041c7c6bac0
Component: engine
2014-09-09 16:17:38 +10:00
ced73947d9
typo fix: immediatly -> immediately
...
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com >
Upstream-commit: fcc7ec8073311cf9d150179895e5d0a32f4cb2e7
Component: engine
2014-09-09 01:16:19 -04:00
f52bbe12a8
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)
Upstream-commit: 1f25bfea2ddbfa5c41ab3f0cd0716229833ebac1
Component: engine
2014-09-09 11:44:51 +10:00
4e3172a877
add -p PORT as a valid format specification
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: e4d2a8231a53794c2b5b28ccf63125a85749e648
Component: engine
2014-09-09 11:16:02 +10:00
5d6a00955d
Merge pull request #7931 from jamtur01/device
...
Added --device flag to run reference
Upstream-commit: bb8ea1fdc1c5c3e1b90c15b451ab22334c86e70c
Component: engine
2014-09-08 14:33:56 -07:00
4188db4b54
Merge pull request #7930 from jamtur01/nformat
...
Very minor formatting update for docs/sources/articles/networking.md
Upstream-commit: 577066fb45114096b919fe073f0436e181e92228
Component: engine
2014-09-08 14:28:29 -07:00
b5848ae179
Merge pull request #7929 from SvenDowideit/doc-tar-stream
...
Sven Dowideit Update export, copy and build API to say 'TAR STREAM' for all versions.
Upstream-commit: 10e4ca760ca1d1145169dbff94e0c8414928b79c
Component: engine
2014-09-08 14:27:45 -07:00
ca58c61a83
Merge pull request #7759 from unclejack/pull_latest_by_default
...
make docker pull only the latest tag by default
Upstream-commit: 85314e7e58a17cf3ebc4b29511b3399cd758b1ae
Component: engine
2014-09-08 13:43:21 -07:00
cc1afc998d
Merge pull request #7891 from tlipinski/master
...
Allows installation on Linux Mint Debian Edition
Upstream-commit: d7e29a2cc8ca749a40e3aa5a42713f76c0d49830
Component: engine
2014-09-08 14:44:07 -04:00
0ece639e47
Merge pull request #7862 from Gandi/bugfixes/segfault-registry-session
...
Fix SEGFAULT if dns resolv error
Upstream-commit: 7bb5ec3be6f3f52cd1aa65e4be20a6d6526a1d3a
Component: engine
2014-09-08 11:38:34 -07:00
3d89f95ea0
Allows installation on Linux Mint Debian Edition
...
Otherwise platform won't be detected
Signed-off-by: Tomasz Lipinski <me@tlipinski.net >
Upstream-commit: 021722cf7afade02c382294e4f276ca7edd1ca69
Component: engine
2014-09-08 20:38:02 +02:00
3593be2c0f
Merge pull request #7871 from vincentbernat/update/zsh-completion-1
...
zsh: update zsh completion for docker command
Upstream-commit: f7429a2121af0e5a77751c674c8a64dbd76c69d8
Component: engine
2014-09-08 11:25:55 -07:00
a07f296d31
Merge pull request #7938 from unclejack/make_run_test_verbose
...
integ-cli: increase verbosity for mem & cpu test
Upstream-commit: 43eab4034b1a88e8f68ce96be44643475201d94d
Component: engine
2014-09-08 14:10:58 -04:00
6dc15f86be
Merge pull request #7609 from ewindisch/max_imgname
...
Restrict length of repository names
Upstream-commit: 18edea2a6f5b01e38e3189dbec54566ad4a67f4f
Component: engine
2014-09-08 11:06:54 -07:00
e6516d4319
Merge pull request #7920 from unclejack/fix_layer_permissions
...
ensure correct permissions are set for directories
Upstream-commit: 11700512b90e093824647bcbbbdfa26ddafea7cc
Component: engine
2014-09-08 10:51:50 -07:00
ff6065975e
integ-cli: increase verbosity for mem & cpu test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 05a76477e6a70975b1c60637c3f8e2d7a507c490
Component: engine
2014-09-08 20:46:45 +03:00
71e8f9134d
integ-cli: test correct directory permissions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: cc5fb986b03ce28075a9f3aee248d401f3be0c96
Component: engine
2014-09-08 20:02:40 +03:00
0db8f36c75
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: )
Upstream-commit: d2f75a3040e72562ffa825d5c3efa7004af2640a
Component: engine
2014-09-08 09:41:26 -07:00
4ee36fda1c
Merge pull request #7914 from jfrazelle/7802-backwards-compat-state
...
fixes #7802 , when api version 1.11 is `json.Marshal`ing the container st...
Upstream-commit: 68e07f3fa09811468a81fb22575650bee69066e6
Component: engine
2014-09-08 12:39:55 -04:00
b4958aa265
Merge pull request #7868 from baloo/patch-1
...
Switch TESTFLAGS to use `-test.run` instead of `-run`
Upstream-commit: 60ab9eaf4a19d691d16c69496364008bbb69d8db
Component: engine
2014-09-08 10:34:49 -06:00
2ff1cc83fb
fixes #7802 , when api version 1.11 is json.Marshaling the container struct
...
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: )
Upstream-commit: f49c3f287b0d26dc705940effa0ec03e1de7bb99
Component: engine
2014-09-08 09:30:33 -07:00
8419ddae48
Include directories that contain changes inside them when calculating diff. Fixes #6722
...
Docker-DCO-1.1-Signed-off-by: Leszek Kowalski <github@leszekkowalski.pl > (github: ljk)
Upstream-commit: 691bbf6a2971bd6d57892cbf7efe188f431919a2
Component: engine
2014-09-08 19:11:48 +03:00
