31470054b1
Validate tag names similar to repository name validation; add tests
...
Addresses #7943
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 46eb4140c915e05a893080b34b42e25b6a75de7b
Component: engine
2014-09-11 17:52:36 -04: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
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
b754dfbfae
add C# docker client library link
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cde53c51b575d0cdeb01fc3428877ab63165e8b0
Component: engine
2014-09-07 23:29:04 -07:00
a6318245ce
Added --device flag to run reference
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 9e34c42d20ef95225bb6c36235d22935365cbef9
Component: engine
2014-09-07 23:17:14 -04:00
c28d415c47
Very minor formatting update for docs/sources/articles/networking.md
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 1ce3e22efc699d90f69b29f68fedf059ec4379a7
Component: engine
2014-09-07 22:39:37 -04:00
30cb064720
Update export, copy and build API to sat 'TAR STREAM' for all versions.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 77fa306d63f0c0e48f49f6679beeb1ea55673f2a
Component: engine
2014-09-08 11:54:21 +10:00
816f39672a
Update docker_remote_api_v1.14.md
...
It is a tar stream, you should mention that somehow.
Here is the proof:
```
host:~$ docker run -t -i ubuntu:14.04 bash
root@c39be4c7b7c8:/# echo "my file contents" > abc
root@c39be4c7b7c8:/# cat abc
my file contents
root@c39be4c7b7c8:/# exit
host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy
abc0100644000000000000000000000002112402102531007674 0ustar0000000000000000my file contents
host:~$ curl -H "Content-Type: application/json" -d '{"Resource":"/abc"}' http://localhost:4500/containers/c39be4c7b7c8/copy > response_content
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 2067 100 2048 100 19 56968 528 --:--:-- --:--:-- --:--:-- 58514
host:~$ tar xvf response_content
abc
host:~$ cat abc
my file contents
```
Docker-DCO-1.1-Signed-off-by: Mustafa Akın <mustafa91@gmail.com > (github: SvenDowideit)
Upstream-commit: b9e889c30988f3babbc059a883d7f3096611ad60
Component: engine
2014-09-08 11:52:27 +10:00
88d96e44fd
Merge pull request #7908 from nhsiehgit/issue363imgfix
...
added a css fix for the image bug issue
Upstream-commit: 4b3ee6c10642a5813b89d5b2e32c01dcede4c871
Component: engine
2014-09-08 11:10:03 +10:00
5b1656c927
pkg/tarsum: add dynamic buffer sizing
...
This commit makes tarsum buffer allocation dynamic. This change
is required to avoid allocating memory excessively after the archive
buffering changes.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 7ef34407509fa76e3ead12a20c8b731f434e1971
Component: engine
2014-09-06 17:39:43 +03:00
112f364609
added a css fix for the image bug issue
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
(github: nhsiehgit)
Upstream-commit: e44bdd612b93e806a1cfcba8c156860de5ef3791
Component: engine
2014-09-05 10:48:51 -07:00
7c69a280eb
Merge pull request #7893 from tianon/travis-run-tests
...
Update Travis to also run the test suite
Upstream-commit: 38186084b3ade82049d03f4f83640a0d47c3040c
Component: engine
2014-09-05 09:19:38 -06:00
64908e2dd5
Fix SEGFAULT if dns resolv error
...
Per registry.doRequest, res and client might be nil in case of error
For example, dns resolution errors, /etc/docker/certs.d perms, failed
loading of x509 cert ...
This will make res.StatusCode and res.Body SEGFAULT.
Signed-off-by: Arthur Gautier <baloo@gandi.net >
Upstream-commit: 3e6c69e5a1dbb428c4a62656f96cfe77c19986f9
Component: engine
2014-09-05 13:40:06 +02:00
1218d181fb
Use a local copy of jquery so that the docs work in China, and offline too.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 5fe94f0d914a20846142a365655dad7a99527b44
Component: engine
2014-09-05 11:48:34 +10:00
7eea51ea83
Merge pull request #7883 from LK4D4/fix_build_race
...
Fix race between dispatchers.run and toDisk
Upstream-commit: b0cff06c9743f1f4edeea38c13a8b657eef446e4
Component: engine
2014-09-04 17:32:46 -07:00
da01801fe3
Merge pull request #7890 from fredlf/docs-cherry-pick-update-process
...
Changes to Sven's cherry pick process
Upstream-commit: 03fdc7d2c183948d2415ba1fc19b8678b59d9e7a
Component: engine
2014-09-05 09:58:18 +10:00
341cb3161f
Update Travis to also run the test suite
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 068b9ac4d2f236905bb9deb024189082876a3c3f
Component: engine
2014-09-04 17:20:02 -06:00
0f1377200f
Merge pull request #7878 from LK4D4/fix_net_for_none
...
Don't initialize network for 'none' mode
Upstream-commit: 1a2a4f61abb3a5b40de70b10f39c90d7593679a5
Component: engine
2014-09-04 15:30:03 -07:00
