e355fe478a
filters: change untagged to dangling
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 3ecfaa8f2da60bb4e6ce6c9ae0428bc7b647e34b
Component: engine
2014-06-02 16:33:52 -04:00
c3f842bed4
server: very debug.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: f322168563dee9d0361524d15c6a5069772b44f8
Component: engine
2014-06-02 16:33:52 -04:00
2dd212e295
filter flag: split out for separate --filter flags
...
adding tests and allowing for easy passing of filters.Args from client
to server.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: f1cc7ce5d728d6bdb1b3ab668e36fb1fc66515ff
Component: engine
2014-06-02 16:33:51 -04:00
f418e0d639
images: fix markdown documentation
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 3391aac2b27ac95f58a20a2eb4046ad1f00b8be6
Component: engine
2014-06-02 16:33:51 -04:00
9a7aaea6bb
images filter: remove the redundant inverted filter
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: cb7857de5d2595632b76e4e17acede85a519001a
Component: engine
2014-06-02 16:33:51 -04:00
9030fc74aa
filters: cleanup & fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: babd5720157898bb33d806bda920d9f9f2df73f0
Component: engine
2014-06-02 16:33:51 -04:00
bf13fd92ad
filters, for images: docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 55d95185edd4a646cd2a05b9397be6b8667d60d0
Component: engine
2014-06-02 16:33:51 -04:00
1771a9601a
filters: remove out filter proc prototype
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: caf9b19b0c444467aff493781afb66df923250ff
Component: engine
2014-06-02 16:33:50 -04:00
f90ca07ea9
filters, for images: start with untagged/tagged boolean
...
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
example like: docker rmi $(docker images -q --filter 'untagged=true')
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 5f3812ec97f9a951bceb482fdcd355b6cbc1b113
Component: engine
2014-06-02 16:33:50 -04:00
6b5620e888
Merge pull request #6159 from SvenDowideit/s3-json-fixup
...
aws json is not javascript style json. trailing comma breaks it :(
Upstream-commit: afb2d5de3de56ff54e1a25f402e369b5f4eb45d0
Component: engine
2014-06-02 12:28:57 -07:00
b3478bf7eb
Merge pull request #6138 from NERSC/6092-setuidrace
...
Fix for setuid race condition in LXC driver
Upstream-commit: 55230b3332f8a24b5100bfa54df5beedf078cd51
Component: engine
2014-06-02 12:16:00 -07:00
26c494ff41
Merge pull request #6160 from crosbymichael/update-test-for-nil-error
...
Update cpu stat test for no error
Upstream-commit: c136384b20970af7b73d16f912fae9b5bffa6b2c
Component: engine
2014-06-02 12:12:49 -07:00
c760899ade
Merge pull request #6147 from cyphar/6142-mflag-strip-quotes-long-equal-form
...
mflag: strip quotes in certain forms from flag values
Upstream-commit: 24ea088124f00896eefc166da1b9e2fad4a03273
Component: engine
2014-06-02 12:03:58 -07:00
77921a7a55
Merge pull request #6130 from vieux/standardize_api_keys
...
Standardize api keys to CamelCase
Upstream-commit: 3e13aaec000aeaa16718e2408b0c371e4de69137
Component: engine
2014-06-02 12:03:11 -07:00
f8096c1d0a
Merge pull request #6150 from LK4D4/remove_used_from_streamformatter
...
Remove unused and racy "used" param from streamformatter
Upstream-commit: 43b7af1dd128b98777d076361d38408e835d24cc
Component: engine
2014-06-02 11:56:05 -07:00
2e677833d3
Update cpu stat test for no error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 30fdac2cb1bd5461972cef6efa3d67270db23491
Component: engine
2014-06-02 11:54:23 -07:00
40e79b8f9e
Merge pull request #6116 from vishh/nsinit_stats
...
Adding "stats" and "spec" option to nsinit CLI
Upstream-commit: f1a217be0ff4ad04c40fd9630fac024fd2c0a581
Component: engine
2014-06-02 11:44:37 -07:00
7eeb43108c
aws json is not javascript style json. trailing comma breaks it :(
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: cac24bbfaf59570863a75e34a21b70ce1cc5c51f
Component: engine
2014-06-03 04:30:32 +10:00
11c1a24c8e
Remove unused and racy "used" param from streamformatter
...
Also tests written
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 1ae37cef9189976c7d3838ba0899e874a0758379
Component: engine
2014-06-02 21:43:07 +04:00
071672b2fe
Update networking.md
...
grammar
Docker-DCO-1.1-Signed-off-by: Andre Dublin <81dublin@gmail.com > (github: andredublin)
rebased by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4ac216d8d3441b8546798711320cb5679d33984d
Component: engine
2014-06-03 03:41:53 +10:00
8148195e5a
Adding "stats" and "spec" option to nsinit binary which will print the stats and spec respectively.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: f7b82be0dd1dc0d9b0fa6c9c194dc2c90af3d133
Component: engine
2014-06-02 06:37:22 +00:00
af5c1612d8
pkg: mflag: flag: added tests for quote-stripped flags
...
This patch adds some tests to ensure that quoted flags are properly
handled by the mflag package.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: e4497feaba31dd33bad790f77f783afc0c695020
Component: engine
2014-06-02 15:25:38 +10:00
460cf60260
pkg: mflag: flag: make mflag strip quotes in -flag="var" forms
...
This patch improves the mflag package to ensure that things arguments
to mflag such as `-flag="var"` or `-flag='var'` have the quotes
stripped from the value (to mirror the getopt functionality for similar
flags).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 0e9c40eb8243fa437bc6c3e93aaff64a10cb856e
Component: engine
2014-06-02 15:25:33 +10:00
1b1746cd69
Adding User Guide
...
* Added User Guide section outlines.
* Added User Guide to menu.
* Moved HTTPS example to articles.
* Replaced Hello World example with User Guide.
* Moved use cases out of examples.
* Updated Introduction to add User Guide.
* Redirected migrated /use and /articles links.
* Added Docker.io section
* Added Dockerized section
* Added Using Docker section
* Added Docker Images section
* Added Docker Links section
* Added Docker Volumes section
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: a7b2c4804b2d98c2b5622db40d3d70b88529d7fe
Component: engine
2014-06-01 17:34:07 -04:00
e0357c5a9f
Merge pull request #6140 from zanedeg/patch-1
...
Updated link to new docker-node-hello repository
Upstream-commit: 4edcbfdeb7d056f47f2eba13c6e005324381ff9e
Component: engine
2014-06-02 07:32:43 +10:00
e26a29105d
Merge pull request #5924 from SvenDowideit/docs-build-instructions
...
Add documentation build steps for the next release manager to follow.
Upstream-commit: 758e23df4d8dbc0c35e70762521215a20c8a6a71
Component: engine
2014-06-01 08:31:51 +10:00
1dae3a407b
Add documentation build steps for the next release manager to follow.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 953abf6ae7b31a3563fa57a9898305018add0571
Component: engine
2014-06-01 08:31:33 +10:00
b92a4a943f
Merge pull request #6089 from unclejack/docker_build_copy
...
add support for COPY to docker build
Upstream-commit: 2024a0e517d9b5e009bd8935de60c4782cc1d17a
Component: engine
2014-06-01 01:26:31 +03:00
8ac48e81c5
Merge pull request #6073 from SvenDowideit/b2d-port-redirection-docs
...
sync the initial port redirection docs from b2d
Upstream-commit: b51802a47ce666e20e6638955d383763d99a04d7
Component: engine
2014-05-31 13:58:28 -07:00
81343783d4
Updated link to new docker-node-hello repository
...
Upstream-commit: 0658868c7f81dd225df8678f31f7ef70274d8d94
Component: engine
2014-05-31 14:55:59 -06:00
a710a9b84a
Fix for setuid race condition in LXC driver
...
This is a fix for a race condition in the LXC driver. This is described
more in issue #6092 .
Closes #6092
Docker-DCO-1.1-Signed-off-by: Shane Canon <scanon@lbl.gov > (github: scanon)
Upstream-commit: f9705477d023c63fb316a30204761aa1e3cb3e6d
Component: engine
2014-05-31 10:42:48 -07:00
bd709c495b
Merge pull request #6128 from crosbymichael/empty-sqlite
...
Init database if empty file
Upstream-commit: 05cf3498a69c271345313ccd38b2de2ae325406f
Component: engine
2014-05-31 06:56:00 +03:00
3248c6e81c
Ensure all dev nodes are copied for privileged
...
This also makes sure that devices are pointers to avoid copies
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 69989b7c06b0ca6737e83ddf8fcfa2dfccc57a7c
Component: engine
2014-05-30 18:39:11 -07:00
636c18b736
update docs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 1dd02ff4a09218eab47533032d1222008d6419b8
Component: engine
2014-05-31 01:28:08 +00:00
2a289bda14
Standardize API keys: CamelCase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 68fb7f4b744bf71206898d32fe203556a6261e5d
Component: engine
2014-05-31 01:22:07 +00:00
d5186289b5
Init database if empty file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b0ea389c694484c0e4907e12a9cf8ff10f80c164
Component: engine
2014-05-30 17:44:00 -07:00
bc9024a72e
Merge pull request #6097 from timthelion/consistentdevices
...
Refactor device handling code
Upstream-commit: 0ef637722f69cff931b25c75d421e231ab75af75
Component: engine
2014-05-31 03:34:52 +03:00
3acef7fcd0
reuse timestamp, don't call time.Now() 3 times
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: b64209f7b6818337a90d2f04627664b5964a29ce
Component: engine
2014-05-31 03:03:51 +03:00
1f86bb208b
Merge pull request #5947 from glebfm/fix-socket-race-condition
...
Fix race condition during socket creation
Upstream-commit: 8ac516094e5b90351cbb436477f06730b1b5e38d
Component: engine
2014-05-30 15:07:06 -07:00
fc5496269e
Merge pull request #6123 from vieux/no_number_default
...
no default default number in names
Upstream-commit: b46449cb33be12efa89b740be15ae98e686ed97a
Component: engine
2014-05-31 00:55:11 +03:00
e4984ac912
Merge pull request #6124 from vieux/standadize_debug_iptables
...
use stderr to debug iptables
Upstream-commit: 0f40cedc2347432e20206e0a03594faeb251f3b1
Component: engine
2014-05-31 00:46:28 +03:00
930b30cb1b
Merge pull request #6065 from vieux/fix_race_waitlock
...
update container's state after we close the waitLock
Upstream-commit: c90faa47b66e3254521ef33eb5b2c8b99d741625
Component: engine
2014-05-31 00:38:35 +03:00
54c61632f8
use stderr to debug iptables
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 5708aa62f36eadca5ada235ca05fddeb1510c1c6
Component: engine
2014-05-30 19:39:42 +00:00
52c8a31f21
Refactor device handling code
...
We now have one place that keeps track of (most) devices that are allowed and created within the container. That place is pkg/libcontainer/devices/devices.go
This fixes several inconsistencies between which devices were created in the lxc backend and the native backend. It also fixes inconsistencies between wich devices were created and which were allowed. For example, /dev/full was being created but it was not allowed within the cgroup. It also declares the file modes and permissions of the default devices, rather than copying them from the host. This is in line with docker's philosphy of not being host dependent.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 608702b98064a4dfd70b5ff0bd6fb45d2429f45b
Component: engine
2014-05-30 19:21:29 +00:00
13006a3fdc
no default default number in names
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e70a5ab0149562609d3a16105aada365ed940cb5
Component: engine
2014-05-30 19:08:21 +00:00
1c65521b44
optimize restore & use Getenv less in daemon.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 0fd0deb75d6e38973f154c5b41c7d4e22a9c4fef
Component: engine
2014-05-30 21:20:27 +03:00
95b0c9bbd6
Atomically increment sequence in pkg/netlink
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: adb639117b5c61479d65dbf8398c0fbeda1d6cad
Component: engine
2014-05-30 16:08:29 +04:00
f31e7878cf
Goroutine-safe daemon.containers
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: af17b01ad7ba0c4d243e2e234710e44a14b6dad4
Component: engine
2014-05-30 16:08:06 +04:00
57a9b63e5e
Fix race in native driver on activeContainers usage
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 64bd6a6a5342c87db7096f60365d270d0d69e9d2
Component: engine
2014-05-30 14:16:00 +04:00
bfa0c1d204
Fix races in set/get currentInterfaces in networkdriver
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 4e5f6951f2af836c3d9163c8a150298ee87468d4
Component: engine
2014-05-30 14:16:00 +04:00
