d83b5dc177
Refactoring in daemon/discovery.go
...
Replace time.Sleep with time.Tick and remove unnecessary var block.
Use Warn log-level instead of error.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 15:21:27 -08:00
fa210a01be
Merge pull request #17838 from calavera/revert_17579
...
Revert "Tidy config/hostconfig structures"
2015-11-09 15:21:26 -08:00
445675e808
Remove unnecessary var block in monitorExec
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 15:14:20 -08:00
62b484411e
Merge pull request #17779 from calavera/fix_dns_regression
...
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
2015-11-09 18:07:07 -05:00
4efe0def0a
Implicitly use swarm:latest so that master and agent use the same version of swarm
...
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
2015-11-09 15:05:17 -08:00
143f3579b0
Merge pull request #17450 from rhatdan/selinux
...
Fix relabel for SELinux
2015-11-09 13:19:28 -08:00
58b270c338
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
2015-11-09 13:15:50 -08:00
3a1200f9f1
Revert "Tidy config/hostconfig structures"
...
This reverts commit ad5052df23
2015-11-09 15:46:45 -05:00
6990f8c616
Allow for env vars to have spaces in some cases
...
Closes #17781
This allows for env vars in EXPOSE to be parsed for spaces so that each
"word" is then treated independently instead of as a single word/arg.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-09 12:42:56 -08:00
69bc4ebe7a
Merge pull request #17819 from tonistiigi/17766-fix-opq-dot
...
Fix opq whiteouts problems for files with dot prefix
2015-11-09 11:08:31 -08:00
d9011b3617
Fix relabel for SELinux
...
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.
If the user does not specify Z or z on the volume mount we should
not attempt a relabel.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-09 14:04:57 -05:00
e509fe604c
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
2015-11-09 19:59:18 +01:00
56c8d4aaef
Merge pull request #17834 from LK4D4/update_runc
...
Update runc to introduce RelabelNeeded function
2015-11-09 10:58:54 -08:00
2786af3add
Merge pull request #17775 from vdemeester/16756-integration-cli-checkers-runs-unix
...
Use checker for docker_cli_run_unix_test.go
2015-11-09 10:44:32 -08:00
8054a30387
dockerversion placeholder for library import
...
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-09 19:32:46 +01:00
0631ec6ca0
Merge pull request #17810 from cpuguy83/graph_cleanup
...
Graph: Un-export non-externally used functions
2015-11-09 10:30:13 -08:00
e1910a8e23
Merge pull request #17829 from albers/completion-stats--all
...
bash completion for `docker stats --all`
2015-11-09 10:29:33 -08:00
427dcb7f82
Merge pull request #17579 from Microsoft/jjh/tidyconfigstructs
...
Tidy config/hostconfig structures
2015-11-09 10:14:58 -08:00
00bcc924fa
Update runc to introduce RelabelNeeded function
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 10:03:25 -08:00
5fa2e4d4f2
Refactor ProcessConfig
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 09:51:09 -08:00
f1a74a89f8
Use an empty slice as default value for DNS, DNSSearch and DNSOptions
...
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.
Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-09 12:46:48 -05:00
7adfb3221e
Merge pull request #17584 from Microsoft/10662-OOMKilled
...
Windows: Refactor exitStatus structure
2015-11-09 09:23:08 -08:00
77af7d1067
Refactor exitStatus structure
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 08:26:35 -08:00
28588efb47
Merge pull request #17089 from Microsoft/10662-ansi
...
Windows: Native ANSI console support
2015-11-09 08:05:08 -08:00
ee13fc5b2f
bash completion for `docker stats --all`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-09 16:27:13 +01:00
a874ce08f3
Fixing wrong volume doc format
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2015-11-09 02:17:50 -06:00
db3070ab1b
Fix opq whiteouts problems for files with dot prefix
...
Fixes #17766
Previously, opaque directory whiteouts on non-native
graphdrivers depended on the file order, meaning
files added with the same layer before the whiteout
file `.wh..wh..opq` were also removed.
If that file happened to have subdirs, then calling
chtimes on those dirs after unpack would fail the pull.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-08 23:00:01 -08:00
944dc7fa8f
Merge pull request #17808 from bboreham/ipc-errormsg
...
Fix typo in container-start error message
2015-11-09 07:58:03 +01:00
c13ca529d3
Merge pull request #17817 from Microsoft/jjh/contained
...
Typo s/contained/container
2015-11-09 07:55:44 +01:00
211e3b0df6
Fix bash completion on systems where extglob is not set
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 22:31:16 -08:00
2ff68910e2
Typo s/contained/container
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-08 18:29:34 -08:00
a2d8c93fc6
Prevent connecting to host and prevent disconnecting from host
...
Container has private network namespace can not to connect to host
and container with host network can not be disconnected from host.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-09 10:19:53 +08:00
3c4dab51d3
Remove DOCKER_EXECDRIVER env
...
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.
Signed-off-by: Lei Jitang <leijiang@huawei.com>
2015-11-09 09:17:32 +08:00
d7a41325fa
Un-export non-externally used functions
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-08 15:51:27 -05:00
93405dd037
Fix typo in error message
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-08 18:05:34 +00:00
8311db14fc
Align configuration of bash completion with existing values
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 09:35:48 -08:00
e357be4abe
Merge pull request #17801 from cpuguy83/remove_dead_graph_code
...
Remove dead graph code
2015-11-08 12:33:27 -05:00
343c8547df
Merge pull request #17762 from LK4D4/builder_commit
...
Use name instead of container in Commit
2015-11-08 15:57:13 +01:00
8c08002a10
Remove dead graph code
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-08 08:57:54 -05:00
70b3ce17b7
Merge pull request #17793 from haoshuwei/modify-improper-comments-on-volume-file
...
Modify improper comments in api/server/router/volume/volume.go
2015-11-08 07:24:48 -05:00
e4d8ea0087
Merge pull request #17792 from cpuguy83/graph_use_locker_pkg
...
Replace `imageMutex` with `Locker` pkg
2015-11-08 12:11:20 +01:00
ea59233eb1
Merge pull request #16533 from justsml/LMDEv2
...
LMDE check added to `check_forked()` function - See #16498
2015-11-08 02:28:11 -08:00
e2a9eede28
Merge pull request #17786 from Microsoft/10662-nativetestunit
...
Windows: Native make test-unit
2015-11-08 11:12:09 +01:00
6efa10f668
Modify improper comments in api/server/router/volume/volume.go
...
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2015-11-08 04:05:59 +00:00
342e6bb99f
Merge pull request #17581 from Microsoft/10662-factoroutexecuser
...
Windows: Factor out user in execdriver\driver
2015-11-07 22:11:26 -05:00
2764839ae1
Replace `imageMutex` with `Locker` pkg
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-07 21:23:12 -05:00
bf5a6d2a83
Merge pull request #17710 from tonistiigi/fix-builder-symlinks
...
Fix symlink handling in builder ADD/COPY commands
2015-11-07 16:32:07 -05:00
98054a8b5c
Merge pull request #17787 from Microsoft/jjh/execdriverutils
...
Don't build utils on Windows
2015-11-07 21:27:32 +01:00
fdc8cce070
Merge pull request #16742 from runcom/10772-docker-stats-all
...
Allow docker stats without arguments
2015-11-07 19:41:03 +00:00
b10dd17e06
Don't build utils on Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:46:36 -08:00
Alexander Morozov
David Calavera
Tibor Vass
Anthony Dahanne
Doug Davis
Dan Walsh
Vincent Demeester
Alexander Morozov
Vincent Demeester
John Howard
Harald Albers
Kai Qiang Wu(Kennan)
Tonis Tiigi
Lei Jitang
Brian Goff
Bryan Boreham
Doug Davis
Antonio Murdaca
Jess Frazelle
Shuwei Hao
Sebastiaan van Stijn