77ce2d3289
remove oracle linux 6 for time being
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 7ddf4214a666c3182acc031cec02fc99c877e98b
Component: engine
2015-12-15 16:34:41 -08:00
dde4bcd6f4
bash completion for docker daemon --authz-plugin
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 069fe81fa602e7d8af98e2b67b761a62526f014a
Component: engine
2015-12-14 13:25:45 -08:00
a0ef20d025
Fix small missing equal sign for 'docker daemon --cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 4ba173630ad2b7a5fc59df280617a1bfa1dda323
Component: engine
2015-12-14 21:20:49 +01:00
0d312f9927
Add zsh completion for 'docker daemon --authz-plugin'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 76844d786bea2e435d25f150044fa242206ce364
Component: engine
2015-12-14 21:16:54 +01:00
3c4fcf6b7a
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
96b1d45a1b
Merge pull request #18242 from jfrazelle/i-have-no-idea
...
Remove ipc rule in docker-engine apparmor profile
Upstream-commit: cd648dce3adf0f15059eb848d3140d5c7b9f350f
Component: engine
2015-12-11 11:23:41 +01:00
4efe3c0424
Merge pull request #18142 from ekuric/mkimage
...
mkimage-yum.sh to support dnf
Upstream-commit: 8cd356630a84699485432fd9ecdde18c0b866a34
Component: engine
2015-12-11 02:27:13 +01:00
77cd3e6f51
Merge pull request #18459 from Microsoft/jjh/winci-bash4fix
...
Windows CI Fix: Allow bash v4
Upstream-commit: 31a31adf7eeebfb0b5ca8622c33ff47d66c6c067
Component: engine
2015-12-10 08:58:32 -08:00
2033d3841f
Improve bash completion for docker network disconnect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d7c9ae60e646e827e741c2be4646d0b867cdc207
Component: engine
2015-12-07 09:55:00 +01:00
260bedb8ba
Windows CI Fix: Allow bash v4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c07e79fa8adfaf8e110803c9d1ad2cf6cbc67ee9
Component: engine
2015-12-06 14:40:29 -08:00
ab6c9709f6
Merge pull request #17989 from jfrazelle/initial-seccomp-support
...
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
339236ffdf
Merge pull request #18408 from tonistiigi/disable-systemd-timeout
...
Disable timeout for systemd
Upstream-commit: 23f00624a174dce985615ba4438303039b16dd09
Component: engine
2015-12-04 12:34:19 -08:00
9e539c7be0
Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
...
Add support for blkio read/write bps device
Upstream-commit: cb6a1a6042fc30e0beeaa79a2f8def4b53019483
Component: engine
2015-12-04 12:29:58 +01:00
99997548a7
Merge pull request #18384 from Mashimiao/weight-device-docs-fix
...
docs: fix blkio-weight-device option args
Upstream-commit: 605c56295fffdf3658d0f6c8faa1b0de03e50e37
Component: engine
2015-12-04 12:04:23 +01:00
d5560ff674
docs: fix weight-deivce option args
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: cc0e407e1778b79a3c75fd68f7c7e48e5449f99b
Component: engine
2015-12-04 09:28:35 +08:00
7be0f9667b
Add support for blkio read/write bps device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29
Component: engine
2015-12-04 09:26:03 +08:00
1c9031a8a0
update go version
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b7b707af2e617d62343391c6c82b984ff41b08e2
Component: engine
2015-12-03 16:37:13 -08:00
6ac4c29a4e
hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ec6d3392f1efc49d0609370e70a749a00555508c
Component: engine
2015-12-03 16:30:51 -08:00
bfb7e82f4d
update packagers.md and kernel config check
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: cde9e8bc83182f0d100c4eda6acb5d4cbc995aac
Component: engine
2015-12-03 16:30:50 -08:00
a19fea4fba
update bash completion for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ae76f7e23e0b9d7aceb711077a7ffc1f0e57de9c
Component: engine
2015-12-03 16:30:49 -08:00
174151a454
update debs/rpms for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 255004ef335d5e6cc4ec0f51ecff676e9d84643b
Component: engine
2015-12-03 16:20:05 -08:00
9f99937185
Merge pull request #17481 from vdemeester/17446-network-inspect-format
...
Add format flag to network inspect
Upstream-commit: 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4
Component: engine
2015-12-03 16:16:04 -05:00
bceb4f3dff
Disable timeout for systemd
...
With content addressability update starting upgraded
daemon for the first time can take a long time if
graph dir was not prepared with a migration tool before.
This avoids systemd timeouts while the migration is
taking place.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: eff5e6498fa424587c339b5ae54e28f003775e4b
Component: engine
2015-12-03 13:15:31 -08:00
72c9d02b1c
Merge pull request #18301 from wenchma/doc_update_for_net
...
Add NETWORK_NAME_or_ID value for --net= option
Upstream-commit: ee3e07d3593f97466df6fc11c19f91c1aee76dd4
Component: engine
2015-12-02 22:36:01 +01:00
f437e2a3c8
Add format flag to network inspect
...
…for consistency as docker inspect and docker volume inspect supports it too
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 295c27388dd1e7cc4196fbb8ffe0646b33bacb5b
Component: engine
2015-12-02 22:32:10 +01:00
a7b1157339
Merge pull request #16277 from runcom/add-oom-score-adj
...
Add OomScoreAdj
Upstream-commit: 8f1f53f735e278bb23bb41d9387a75786d7ec1dc
Component: engine
2015-12-02 11:49:51 -08:00
71b21cf347
This patch adds --tmpfs as a option for mounting tmpfs on directories
...
It will Tar up contents of child directory onto tmpfs if mounted over
This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: b3e527dfd242ad30c0297c8b257862116cf2c50e
Component: engine
2015-12-02 10:06:59 -05:00
f2ea55aeff
Add NETWORK_NAME_or_ID value for --net= option
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 08328cb703c51ed4a2dfe985f618925fe3234080
Component: engine
2015-12-02 22:49:35 +08:00
d5614b1f4a
Merge pull request #18315 from jfrazelle/change-frozen-image-v2
...
update download-frozen-image.sh to v2 registry
Upstream-commit: da0c9286a9e82a88e75eb9298e96426978fba4bc
Component: engine
2015-12-01 17:12:00 -05:00
a29b07bf59
update download-frozen-image.sh to v2 registry
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 359d0c247fe523ef82676f9ae4046b79e6854fe1
Component: engine
2015-12-01 13:16:42 -08:00
1f54cbf9d8
Merge pull request #18211 from Djelibeybi/master
...
Updated LICENSE file
Upstream-commit: 94997e56a9a65ee651f759377be1f83f03693656
Component: engine
2015-11-30 14:37:29 -08:00
d6e4b2d7b7
Merge pull request #18178 from jfrazelle/apparmor-we-meet-again
...
Fix docker-default profile handing signals
Upstream-commit: e852959fadf7ec77ffb57877806603b8c0bf523e
Component: engine
2015-11-30 11:34:34 -08:00
d3dbad3a43
check version for docker-default aa profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f8db9a09e0ec9b1925839ffff4f1cc5fe3ace630
Component: engine
2015-11-30 10:18:12 -08:00
ddf1fb3149
Add OomScoreAdj to configure container oom killer preferences
...
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com >
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: d3af7f283d8dc0be67be48e14cd740fbeb690f7a
Component: engine
2015-11-30 11:19:04 +01:00
4b9793bd14
Remove ipc rule in docker-engine apparmor profile
...
On a ubuntu 15.04 machine with apparmor_parser version 2.10 I get
```
Syntax Error: Unknown line found in file:
/etc/apparmor.d/docker-engine line: 26
```
when running `aa-complain /etc/apparmor.d/docker-engine`.
It's super weird because ipc is documented in the apparmor manual, but it
doesnt seem to be working at all. Tested on a few servers.
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 68c9ebdf1f4691a7d5bf5fb9f40021f977ca8f3f
Component: engine
2015-11-25 11:32:00 -08:00
b7eb93788c
Updated LICENSE file to match selinux-policy and the license in the docker-engine-selinux.spec file.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 09b7af9095246434c38ed1a9cc3a3ce6801ab180
Component: engine
2015-11-25 11:53:01 +11:00
5c2015e2d5
Merge pull request #17714 from mikedougherty/cs-release-fixes
...
Fixes for release scripts
Upstream-commit: ae1fadeb96c8f64f1eebe2b729c07048398de013
Component: engine
2015-11-23 19:47:10 -08:00
a265b48c9a
Fixes for release scripts:
...
Add a flag to allow keeping bundles around (helps with CI)
Fix several problems in repo make targets
* quote DOCKER_EXPERIMENTAL variable
* pass-through arguments for gpg provided to dpkg-sig are now quoted
properly, so passphrases with shell-interpolated symbols can be used
* when determining deb suites, don't rely on 'origin' to be
github.com/docker/docker
Fix some issues with deb repository creation from scratch
* Don't add empty components to the repository configuration as they
will cause failure when generating.
Add old docker-engine-cs name to package conflicts
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com >
Upstream-commit: a15b67b1affb2eac5365614e55703f43b6f73e9b
Component: engine
2015-11-23 17:15:54 -08:00
d83e223879
Policy extensions for user namespaces and docker exec
...
A few additions to the policy when running with user namespaces enabled
and when running 'docker exec'.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com >
Upstream-commit: 6079d9d6a3b63fa8d9aa7a3981c6c37cc435bccb
Component: engine
2015-11-23 15:19:45 -08:00
68fe06d253
mkimage-arch: remove the test container after run
...
Signed-off-by: Rui Lopes <rgl@ruilopes.com >
Upstream-commit: ca94adc7c1ff7719be704282fe6daf1fb57161e0
Component: engine
2015-11-22 11:49:54 +00:00
06f87da37b
mkimage-yum.sh to support dnf
...
included changes @tianon proposed in #17362
Signed-off-by: Elvir Kuric <elvirkuric@gmail.com >
Upstream-commit: 5c329633d7ce7adfa390e70b91c3e87c5d05ef93
Component: engine
2015-11-21 13:06:27 +01:00
63ffbd873f
Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache
...
zsh: ensure we have enough commands to store in the cache
Upstream-commit: 33d9ae358cbeb7093a61eff9b2fa7d842e1d96f1
Component: engine
2015-11-18 10:36:32 +01:00
9ac360f32a
zsh: remove lxc-related completion
...
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334 .
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 8105a3a366bb22d1df843c828a16b6cae26e9531
Component: engine
2015-11-18 08:13:03 +01:00
f0c2b7dcae
zsh: ensure we have enough commands to store in the cache
...
Otherwise, the cache would be invalid and won't be refreshed soon. This
can happen when the user has the completion installed before docker is
installed.
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 61564bcb5f79754cf4e17a707731d9f78169c150
Component: engine
2015-11-18 08:08:43 +01:00
fe4028f4f6
Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
...
Add zsh completion for log options
Upstream-commit: 346d195f6a8ed5217cb859ed1a6673eeb840e21d
Component: engine
2015-11-17 15:53:31 -08:00
cbf9321ca8
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
2015-11-16 10:11:27 -08:00
02d6078f37
bash completion for docker {run,create} --volume-driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d411c47139e9a6d94c54bfb4052e7d12bf4295f0
Component: engine
2015-11-15 09:53:22 -08:00
8d0649a213
correct ltdl for centos
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 41619f4a902927767d149524b45d23ab9569636b
Component: engine
2015-11-14 08:50:58 -08:00
08e6893ada
update debs/rpms for pkcs11 yubikey things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: cf4c3da725e5c923b637a0dbea3d20064286f008
Component: engine
2015-11-13 13:20:53 -08:00
c0d8796b26
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
