3243e504d0
Ensure adding a broken tar doesn't silently fail
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-11-23 14:18:58 +00:00
6f6f10a75f
prevent journald from being built on ARM
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-11-21 15:17:31 +01:00
9ca2e4e81c
Move exec store to its own package inside the daemon.
...
Remove double reference between containers and exec configurations by
keeping only the container id.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-20 17:40:16 -05:00
b5c507750f
Merge pull request #18051 from calavera/extract_streams
...
Extract StreamConfig struct out of the daemon package.
2015-11-20 13:45:13 -08:00
3f5b8f712d
Extract StreamConfig struct out of the daemon package.
...
This is a small configuration struct used in two scenarios:
1. To attach I/O pipes to a running containers.
2. To attach to execution processes inside running containers.
Although they are similar, keeping the struct in the same package
than exec and container can generate cycled dependencies if we
move any of them outside the daemon, like we want to do
with the container.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-20 15:04:27 -05:00
f064b9941c
Merge pull request #18073 from runcom/hostconfig-resources
...
runconfig: split resources into a struct
2015-11-20 20:29:44 +01:00
8fa09749fb
Merge pull request #17718 from wenchma/17716_before_filter_doc
...
Re-implement --before and --since as options for --filter
2015-11-20 11:24:19 -08:00
1a0b483e02
runconfig: split resources into a struct
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-20 19:40:01 +01:00
1921c62938
Re-implement --before and --since as options for --filter
...
* This commit will mark --before and --since as deprecated, but leave their behavior
unchanged until they are removed, then re-implement them as options for --filter.
* And update the related docs.
* Update the integration tests.
Fixes issue #17716
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-20 13:10:13 +08:00
5aeaf2a0c4
Addition of "--shm-size" to which size of /dev/shm is changed.
...
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
when container is made.
- Being able to specify is a numerical value that applies number,
b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.
Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
2015-11-20 09:24:18 +09:00
8e6e38990c
Merge pull request #18084 from wenchma/18054_exec_start_fix
...
Update docs and test of exec create api return codes
2015-11-19 13:51:46 -08:00
24fb3659df
Merge pull request #18076 from rhvgoyal/unmount-recursive
...
Unmount recursively to unmount volumes
2015-11-19 13:46:48 -08:00
37f64ded44
Merge pull request #17908 from calavera/carry_17059
...
[Carry 17059] allow filtering containers by any status
2015-11-19 13:24:43 -08:00
b9e701b203
Use lazy unmount to unmount volumes
...
Volumes can have more mount points beneath them and unmount will fail. This
is the case when a bind mounted directory on host already had a mount point
underneath it. So use lazy unmount instead.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-11-19 20:46:07 +00:00
f30364c583
allow filtering containers by any status
...
Signed-off-by: Kamil Domański <kamil@domanski.co>
(cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1)
2015-11-19 14:11:41 -05:00
37d2a70038
Windows: [TP4] docker info crashes
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-19 11:02:25 -08:00
01b86d612c
Update docs and test of exec create api return codes
...
Fixes issue #18054
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-19 22:22:27 +08:00
c32f8bb36a
Merge pull request #17704 from LK4D4/default_cgroupfs
...
Use fs cgroups by default
2015-11-19 14:01:13 +01:00
419fd7449f
Use fs cgroups by default
...
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-18 16:16:13 -08:00
877fe61f75
Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all
...
Remove the container initializers per platform.
2015-11-18 14:06:47 -08:00
060f4ae617
Remove the container initializers per platform.
...
By removing deprecated volume structures, now that windows mount volumes we don't need a initializer per platform.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-18 08:41:46 -05:00
84781a5df7
docker info suppports case-insensitive proxy env settings
...
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
2015-11-18 10:58:19 +09:00
3f508f08de
Merge pull request #17261 from mountkin/remove-unused-daemon-config
...
remove the unused DefaultNetwork member from daemon.Config
2015-11-17 16:33:11 -08:00
104dab87ea
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
2015-11-17 15:44:57 -08:00
adce1981f4
Merge pull request #17593 from daehyeok/refactoring_json_log
...
Refactoring json log driver
2015-11-17 15:38:52 -08:00
d3744fbeb1
Merge pull request #18002 from Microsoft/10662-registerlinks
...
Windows: Disable links
2015-11-17 11:48:53 -08:00
1ecb9a40db
Merge pull request #17974 from anusha-ragunathan/fsMagic
...
Fix devmapper backend in docker info
2015-11-17 11:44:48 -08:00
9187656305
Merge pull request #16639 from mrunalp/skip_dev_setup
...
Skip /dev setup in container when it is bind mounted in
2015-11-17 11:36:00 -08:00
4dda67b801
Merge pull request #16452 from rhatdan/btrfs-selinux
...
Relabel BTRFS Content on container Creation
2015-11-17 11:03:40 -08:00
f18d5da6a7
Merge pull request #17300 from kunalkushwaha/plugin-info
...
Patch for Plugin drivers in docker info
2015-11-17 10:46:29 -08:00
6f1bc096a6
Merge pull request #18025 from Microsoft/10662-ArgumentEscaping
...
Windows: Fix docker exec
2015-11-17 11:14:54 +01:00
d7692b02bd
Typo in previous PR processConfig, not c.ProcessConfig
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-16 11:56:01 -08:00
a3065fa48f
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
2015-11-16 10:11:27 -08:00
92487d7fb4
Merge pull request #17985 from Microsoft/jjh/firstboot
...
Windows: [TP4] Fix regression on second or later container starts
2015-11-16 10:03:46 +01:00
aa7fd884e6
Supported added for reterving Plugin list for Network and Volume.
...
Also, plugin information in docker info output.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-16 15:28:09 +09:00
b2771b4456
Windows: Disable links
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-15 21:32:31 -08:00
cf824d9749
Merge pull request #17479 from coolljt0725/show_warning
...
Show warning when user specify dm.basesize for already initialized devicemapper driver
2015-11-15 08:51:33 +01:00
086c0b4a66
Extract rotate file writer from json log driver
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2015-11-14 16:15:44 -07:00
49779b674a
Add pkg/parsers/architecture and pkg/platform
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-14 23:03:02 +01:00
4e8fcd4002
/info: Add keys Architecture, OSType
...
- introduces Swarm-relevant keys, see #13634
- docs updated
Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
2015-11-14 22:21:45 +01:00
8da449055f
Windows: Fix regresion on first boot
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-14 11:06:19 -08:00
ad8a66573c
Merge pull request #17851 from Microsoft/10662-ArgumentEscaping
...
Prevent double escaping of Dockerfile commands on Windows
2015-11-14 17:25:53 +01:00
fdc2641c2b
Fix devmapper backend in docker info
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2015-11-13 21:05:47 -08:00
439633cee6
Merge pull request #17977 from Microsoft/jjh/archivewindowscomment
...
Windows: Fixes comment in archive_windows.go
2015-11-13 16:00:14 -08:00
58244392e5
Merge pull request #17979 from Microsoft/jjh/tidytodowindows
...
Remove 'TODO Windows' unnecessary comment
2015-11-13 15:59:06 -08:00
13963957eb
Merge pull request #17877 from aaronlehmann/capped-bytespipe
...
Cap the amount of buffering done by BytesPipe
2015-11-14 00:51:11 +02:00
5e2d4aaec2
Merge pull request #17980 from Microsoft/jjh/configuresysinit
...
Remove uncalled configureSysInit
2015-11-13 14:30:03 -08:00
2648655a4a
Remove uncalled configureSysInit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:43:09 -08:00
208ad80605
Remove TODO Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 13:07:27 -08:00
e5261d6e4a
Windows: Fixes comment
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-13 12:51:05 -08:00
42fa8e3128
Merge pull request #17417 from cpuguy83/15815_add_log_file_poller
...
Fallback to file polling for jsonlog reader on err
2015-11-13 11:49:54 -08:00
9db5db1b94
This fixes the case where arguments are escaped twice from Dockerfiles on
...
Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-13 10:43:06 -08:00
cccf674943
Merge pull request #16873 from coolljt0725/expand_docker_info
...
Add more cgroup config to docker info
2015-11-13 09:37:06 -08:00
f9daecc880
Rename daemon/utils_*.go to selinux
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-12 15:48:41 -08:00
588fedef4a
Merge pull request #17949 from Microsoft/jjh/cpuweighttp4
...
Windows: TP4 fix cpu weight
2015-11-12 21:13:09 +01:00
318a13b0af
Merge pull request #17948 from LK4D4/splunk_windows
...
Enable Splunk logdriver for windows
2015-11-12 20:44:31 +01:00
812a1c149a
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
90eac6b48b
Windows: TP4 fix cpu weight
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-12 11:08:24 -08:00
705b50850c
Enable Splunk logdriver for windows
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-12 10:57:21 -08:00
64f8ee444d
Cap the amount of buffering done by BytesPipe
...
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.
Adjust tests to work with the blocking Read and Write functions.
Remove BufReader, since now its users can use BytesPipe directly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-12 10:11:29 -08:00
8cf38b6a8b
Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
...
Refactor ProcessConfig
2015-11-12 07:28:32 -08:00
26855c7801
Allow configurable metadata for Splunk log driver
...
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.
Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-11-12 06:36:51 -08:00
fa7ec908c4
daemon/kill.go: simplify if statement
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-11 17:19:39 -08:00
87de5fdd59
Merge pull request #17919 from Microsoft/jjh/tp4
...
Windows [TP4] Require build 10586+
2015-11-11 19:36:13 -05:00
5b046c71d8
Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes
...
Windows [TP4] Fix docker cp when volumes
2015-11-11 19:35:05 -05:00
122568b314
Windows [TP4] Require build 10586+
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-11 14:49:14 -08:00
6c82fba2b3
Merge pull request #17894 from mqliang/deferMove
...
move defer statement for readability
2015-11-11 14:03:48 -08:00
3a852d8442
Windows [TP4] Fix docker cp when volumes
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-11 14:02:07 -08:00
adb14543fd
Merge pull request #17903 from rhvgoyal/default-to-xfs-v2
...
Devicemapper: Default to xfs instead of ext4
2015-11-11 16:42:58 -05:00
37dfae3cde
Merge pull request #17909 from LK4D4/info_simple
...
daemon/info.go: assign proxy fields directly
2015-11-11 21:15:13 +01:00
1716d497a4
Relabel BTRFS Content on container Creation
...
This change will allow us to run SELinux in a container with
BTRFS back end. We continue to work on fixing the kernel/BTRFS
but this change will allow SELinux Security separation on BTRFS.
It basically relabels the content on container creation.
Just relabling -init directory in BTRFS use case. Everything looks like it
works. I don't believe tar/achive stores the SELinux labels, so we are good
as far as docker commit.
Tested Speed on startup with BTRFS on top of loopback directory. BTRFS
not on loopback should get even better perfomance on startup time. The
more inodes inside of the container image will increase the relabel time.
This patch will give people who care more about security the option of
runnin BTRFS with SELinux. Those who don't want to take the slow down
can disable SELinux either in individual containers or for all containers
by continuing to disable SELinux in the daemon.
Without relabel:
> time docker run --security-opt label:disable fedora echo test
test
real 0m0.918s
user 0m0.009s
sys 0m0.026s
With Relabel
test
real 0m1.942s
user 0m0.007s
sys 0m0.030s
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-11 14:49:27 -05:00
1df0bb5a13
daemon/info.go: assign proxy fields directly
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-11 11:03:53 -08:00
0b566566c6
Merge pull request #17858 from sanimej/libn
...
Allow port mapping only for endpoint created on docker run
2015-11-11 11:00:31 -08:00
2bb1c530d7
Merge pull request #17193 from cpuguy83/refactor_store_errors
...
Refactor volume store's error usage
2015-11-11 10:25:00 -08:00
7a985cfafc
Merge pull request #17890 from aboch/b6
...
Restore deterministic IPv6 from MAC behavior on default bridge network
2015-11-11 12:42:08 -05:00
07ff17fb85
devmapper: Switch to xfs as default filesystem if supported
...
If platform supports xfs filesystem then use xfs as default filesystem
for container rootfs instead of ext4. Reason being that ext4 is pre-allcating
lot of metadata (around 1.8GB on 100G thin volume) and that can take long
enough on AWS storage that systemd times out and docker fails to start.
If one disables pre-allocation of ext4 metadata, then it will be allocated
when containers are mounted and we will have multiple copies of metadata
per container. For a 100G thin device, it was around 1.5GB of metadata
per container.
ext4 has an optimization to skip zeroing if discards are issued and
underlying device guarantees that zero will be returned when discarded
blocks are read back. devicemapper thin devices don't offer that guarantee
so ext4 optimization does not kick in. In fact given discards are optional
and can be dropped on the floor if need be, it looks like it might not be
possible to guarantee that all the blocks got discarded and if read back
zero will be returned.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-11-11 12:07:35 -05:00
83a34e000b
devmapper: Warn if user specified a filesytem and base device already has fs
...
If user wants to use a filesystem it can be specified using dm.fs=<filesystem>
option. It is possible that docker already had base image and a filesystem
on that. Later if user wants to change file system using dm.fs= option
and restarts docker, that's not possible. Warn user about it.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-11-11 12:07:35 -05:00
095a8ac545
Restore IPv6 from MAC on default bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-11 08:36:04 -08:00
0fbfa1449d
Add support for blkio.weight_device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-11-11 23:06:36 +08:00
1066725395
Merge pull request #16774 from tonistiigi/15643-aufs-plnk
...
Copy aufs hardlinks to top layer
2015-11-11 07:59:41 +01:00
d71eeb1c05
move defer statement for readability
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-11 11:28:23 +08:00
43012fe842
Refactor volume store's error usage
...
Uses an errors API similar the `net` package.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-10 20:33:29 -05:00
5b718bdee2
Merge pull request #17874 from LK4D4/nocheck_nil_map
...
daemon/info.go: remove check for map nilness
2015-11-10 12:52:52 -08:00
d4c4557b1a
Merge pull request #17613 from Microsoft/10662-isolationexecopt
...
Windows: Add default isolation exec driver option
2015-11-10 19:55:46 +00:00
a429ad1e35
Windows: Add default isolation exec driver option
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-10 11:39:05 -08:00
470fc94f38
Merge pull request #17476 from coolljt0725/prevent_connect_to_host
...
Fix connect to host and prevent disconnect from host for host network
2015-11-10 09:48:33 -08:00
8f311f4d8c
daemon/info.go: remove check for map nilness
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-10 09:20:59 -08:00
e035d27223
Show warning when user specify dm.basesize for already initialized devicemapper drive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-10 14:50:19 +08:00
6f2c6111d4
Merge pull request #17843 from LK4D4/discovery_refactor
...
Refactoring in daemon/discovery.go
2015-11-10 07:34:11 +01:00
70579bd558
Merge pull request #17847 from LK4D4/exec_unnec_var
...
Remove unnecessary var block in monitorExec
2015-11-09 23:32:38 -06:00
76992f3e23
remove the unused DefaultNetwork member from daemon.Config
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-10 09:51:15 +08:00
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
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
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
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
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
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
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
944dc7fa8f
Merge pull request #17808 from bboreham/ipc-errormsg
...
Fix typo in container-start error message
2015-11-09 07:58:03 +01: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
93405dd037
Fix typo in error message
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-08 18:05:34 +00: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
342e6bb99f
Merge pull request #17581 from Microsoft/10662-factoroutexecuser
...
Windows: Factor out user in execdriver\driver
2015-11-07 22:11:26 -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
ae818a820f
Allow docker stats without arguments
...
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-07 17:03:33 +01:00
10df5647bd
Merge pull request #17757 from rhvgoyal/log-blkid-failure
...
devmapper: Provide more error information if blkid fails
2015-11-07 09:16:14 -05:00
ad55d29c91
Merge pull request #17575 from Microsoft/10662-nativetemplate
...
Windows: Fix native exec template
2015-11-06 16:14:44 -08:00
1ba280a8db
Merge pull request #17576 from Microsoft/10662-graphtest
...
Windows: Fix daemon\graphdriver\graphtest
2015-11-06 15:13:31 -08:00
451b79d691
Test to verify --mac-address doesn't get applied to new endpoint
...
created on network connect.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2015-11-06 14:52:35 -08:00
dedcf6a6ff
Allow port mapping only for endpoint created on docker run
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2015-11-06 13:54:17 -08:00
47da59f7ec
Fix symlink handling in builder ADD/COPY commands
...
Fixes #17290
Fixes following issues:
- Cache checksums turning off while walking a broken symlink.
- Cache checksums were taken from symlinks while targets were actually copied.
- Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-06 10:58:12 -08:00
38e34cf6da
Use name instead of container in Commit
...
It will make daemon interface separation easier later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-06 10:22:00 -08:00
2c8b7c597a
devmapper: Provide more error information if blkid fails
...
Right now if blkid fails we are just logging a debug message and don;t return
the actual error to caller. Caller gets the error message that thin pool
base device UUID verification failed and it might give impression that thin
pool changed. But that's not the case. Thin pool is in such a state that we
could not even query the thin device UUID. Retrun error message appropriately
to make situation more clear.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-11-06 08:21:20 -05:00
00d00b429f
Remove LxcConf in daemon_test.go and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-06 09:58:06 +08:00
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
b232362310
Merge pull request #17735 from LK4D4/errcode_resize
...
Move errcode handling for resize upper
2015-11-05 15:00:48 -08:00
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
3b5fac462d
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:57 -05:00
bb0e7eb196
Move errcode handling for resize upper
...
It'll allow to separate daemon layer more cleanly later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-05 13:42:33 -08:00
b52bedbd48
Merge pull request #17726 from runcom/fix-errors-format
...
Fix errors format
2015-11-05 13:30:57 -08:00
c7b65288e4
Merge pull request #17685 from WeiZhang555/cluster-parser
...
Fix `--cluster-store` option parser
2015-11-05 13:21:52 -08:00
9465d6ee6a
Merge pull request #17534 from Microsoft/10662-filterhyperv
...
Windows: Add isolation to ps filter
2015-11-05 15:55:47 -05:00
9c5814171c
Windows: Add isolation to ps filter
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-05 10:18:24 -08:00
77826333fe
Fix errors format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-05 18:17:37 +01:00
c136a33c5b
Fallback to file polling for jsonlog reader on err
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-05 10:05:05 -05:00
bb9eca9036
Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create
...
Optimize Create Container to skip extra mount on Windows.
2015-11-05 09:15:28 -05:00
0ebdac8bee
Fix `--cluster-store` option parser
...
`--cluster-store` is of form KV-PROVIDER://KV-URL, this commit makes
sure that KV-URL contains no "://"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-05 11:45:08 +08:00
f18c5e9714
Merge pull request #17703 from aboch/np
...
Verify Endpoint.Info() before accessing it
2015-11-04 19:23:11 -05:00
236913f4e8
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
2015-11-05 00:50:08 +01:00
9c1006c8bf
Merge pull request #17673 from LK4D4/elim_str_comparison
...
Do not rely on string comparison in truncindex
2015-11-04 15:39:19 -08:00
9112d90b27
Optimize Create Container to skip extra mount on Windows.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-11-04 14:43:50 -08:00
54d22cbd9a
Verify Endpoint.Info() before accessing it
...
- During concurrent operations in multihost environment,
it is possible that the implementer of `EndpointInfo`
is nil. It simply means the endpoint is no longer
available in the datastore.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-04 13:27:17 -08:00
41de7a18d8
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-04 15:18:50 -05:00
d4a8d09d1a
Do not rely on string comparison in truncindex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-04 11:34:05 -08:00
63efc12070
Remove further references to the daemon within containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:28:54 -05:00
444c82d19d
Remove daemon field from container.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:49 -05:00
5dc3a9a6da
Decouple daemon and container from the stats collector.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:49 -05:00
c412300dd9
Decouple daemon and container to configure logging drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:49 -05:00
669949d6b4
Decouple daemon and container to manage networks.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
019c337b93
Decouple daemon and container to cleanup containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
ca5ede2d0a
Decouple daemon and container to log events.
...
Create a supervisor interface to let the container monitor to emit events.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
2c72015ce3
Decouple daemon and container to manage volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
c1c42db060
Decouple daemon and container to execute processes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
ebf707ec5f
Move `Daemon.containerCopy` to daemon/archive.go
...
It's the only place where it's used.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
89decc4446
Remove unused function `Container.getImage`.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
6ea9a880dc
Remove unnecessary `Container.changes` function.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
3a49765046
Decouple daemon and container to mount and unmount filesystems.
...
Side effects:
- Decouple daemon and container to start containers.
- Decouple daemon and container to copy files.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
1c94f5f53a
Decouple daemon and container to export containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
9f79cfdb2f
Decouple daemon and container to pause and unpause containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
4f2a5ba360
Decouple daemon and container to stop and kill containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
581380cc6c
Move `exportContainerRw` to the daemon.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
0f41761290
Merge pull request #17672 from LK4D4/unn_var
...
Remove unnecessary var decls
2015-11-04 12:24:52 +01:00
cec31abfea
Remove unnecessary var decls
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-03 17:03:40 -08:00
c9208953fa
Merge pull request #17630 from LK4D4/syscall_umount_warn
...
Do not ignore error from syscall.Unmount
2015-11-03 19:58:19 -05:00
562a1263f2
Merge pull request #17665 from LK4D4/setupwd_refactor
...
Reorder code slightly in setupWorkingDirectory
2015-11-03 15:56:10 -08:00
e704182c9c
Merge pull request #17614 from LK4D4/fix_golint
...
Update linting tools to latest versions
2015-11-03 15:32:12 -08:00
bb66c16871
Reorder code slightly in setupWorkingDirectory
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-03 14:33:31 -08:00
c30b9e590c
Merge pull request #17606 from mountkin/increase-max-retries
...
increase the maxJSONDecodeRetry in json log reader
2015-11-03 13:45:45 -05:00
aff8bd178c
Merge pull request #17638 from calavera/move_net_stats_collector
...
Make the stats collector to collect network stats.
2015-11-03 10:31:40 -08:00
8d5695470a
Merge pull request #17629 from tonistiigi/kill-autorestart-fix
...
Fix race causing autorestart turning off on restart
2015-11-03 08:24:11 -08:00
b8aaa4b07c
Fix race causing autorestart turning off on restart
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-02 18:37:55 -08:00
453473d6a9
Make the stats collector to collect network stats.
...
Currently, we get the network stats each time per subscriber, causing a
high load of cpu when there are several subscribers per container.
This change makes the daemon to collect once and publish N times, where N is the
number of subscribers per container.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-02 21:06:44 -05:00
79d47c5b96
Merge pull request #17628 from LK4D4/umount_log_err
...
Log error from unmountVolumes on cleanup
2015-11-02 15:38:32 -08:00
3f10bdf100
Do not ignore error from syscall.Unmount
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 14:40:29 -08:00
944ea3134d
Merge pull request #17554 from calavera/warm_ipc_unmounts
...
Turn IPC unmount errors into warnings.
2015-11-02 14:25:39 -08:00
a20fea1823
Log error from unmountVolumes on cleanup
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 14:11:42 -08:00
beeec6d103
Merge pull request #17558 from aboch/nw
...
Fix bug in initializeNetwork()
2015-11-02 12:15:41 -08:00
45e71a7984
Fix bug in initializeNetwork()
...
- On `docker run --net <network id> ...`
the bug would cause the container to attempt
to connect to the network two times
- Also made sure endpoint creation rollback will
be executed on failures in `func (container *Container) connectToNetwork()`
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-02 11:20:15 -08:00
10e1b9f02e
Vendoring libnetwork
...
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-11-02 08:33:52 -08:00
7aa28b6bdd
Fix go vet warnings
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 08:28:34 -08:00
b087846c0e
Fix error formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 06:51:48 -08:00
a82f9ac819
increase the maxJSONDecodeRetry in json log reader
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-02 17:51:22 +08:00
8764967381
Windows: Fix daemon\graphdriver\graphtest
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 21:14:18 -07:00
910e4ba7ed
Windows: Factor out user in execdriver\driver
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 19:19:24 -07:00
be2f53ece8
Windows: Fix native exec template
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 11:39:19 -07:00
4468e1e74e
Merge pull request #17567 from Microsoft/10662-lxcunittest
...
Windows: Fix go test in execdriver\lxc
2015-10-31 09:40:19 -07:00
8d584da96e
Merge pull request #17568 from Microsoft/10662-journald
...
Windows: Fix journald compile error
2015-10-31 09:35:39 -07:00
5452954d89
Windows: Fix journald compile error
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 08:31:25 -07:00
30ab497e17
Windows: Fix go test in execdriver\lxc
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 08:25:36 -07:00
5719d01066
Merge pull request #16579 from coolljt0725/fix_attach_paused_container
...
Add show error when attach to a paused container
2015-10-31 07:43:22 -07:00
ed6e3cf704
Merge pull request #17537 from mountkin/fix-logger-race
...
fix a race in json logger reader
2015-10-30 23:00:17 -07:00
f87082f08e
Merge pull request #17545 from LK4D4/writehs_encode
...
Use json.Encoder for container.writeHostConfig
2015-10-30 21:11:15 -04:00
2e466bafda
Merge pull request #17548 from mavenugo/ugr
...
Vendoring libnetwork to fix #17526 & #17527
2015-10-30 17:13:40 -07:00
6d8aff07ac
Merge pull request #17547 from LK4D4/unn_stat
...
Remove unnecessary Stat check from readHostConfig
2015-10-30 16:56:11 -07:00
9bf20c6847
Merge pull request #17549 from donhcd/fixPre122Stats
...
fix pre-1.21 docker stats
2015-10-30 16:45:41 -07:00
401632c756
fixing ungraceful daemon restart case where nw connect is not persisted
...
For graceful restart case it was done when the container was brought
down. But for ungraceful cases, the persistence is missing for nw
connect
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-30 16:24:02 -07:00
a54d5932e3
Turn IPC unmount errors into warnings.
...
And do not try to unmount empty paths.
Because nobody should be woken up in the middle of the night for them.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-30 19:13:52 -04:00
33f5429786
Merge pull request #17538 from calavera/deprecated_bridge_interface
...
Fix network inspect for default networks.
2015-10-30 16:03:51 -07:00
d2c04f844b
fix pre-1.22 docker stats
...
This fixes a bug introduced in #15786 :
* if a pre-v1.20 client requested docker stats, the daemon
would return both an API-compatible JSON blob *and* an API-incompatible JSON
blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629
Signed-off-by: Donald Huang <don.hcd@gmail.com>
2015-10-30 22:28:03 +00:00
0c991f3d68
Merge pull request #16779 from Microsoft/10662-execdrivercommand
...
Windows: Refactor execdriver.Command
2015-10-30 14:59:59 -07:00
36a69bbc60
Remove unnecessary Stat check from readHostConfig
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-30 14:54:09 -07:00
cf1a6c08fa
Use json.Encoder for container.writeHostConfig
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-30 14:45:35 -07:00
23a0fe9627
Merge pull request #17539 from cpuguy83/cleaner_ipc_unmount_handling
...
Force IPC mount to unmount on daemon shutdown/init
2015-10-30 14:40:42 -07:00
85d7bbf7aa
Merge pull request #17528 from LK4D4/todisk_encode
...
Use json.Encoder for container.toDisk
2015-10-30 14:36:42 -07:00
74362e8392
Merge pull request #17531 from crosbymichael/no-set-reservation
...
Don't set mem soft limit if not specifiecd
2015-10-30 17:01:36 -04:00
f301c5765a
Fix network inspect for default networks.
...
- Keep old fields in NetworkSetting to respect the deprecation policy.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-30 16:55:21 -04:00
9d14866d71
Windows: Refactor execdriver.Command
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 13:53:00 -07:00
805dd0eeed
Windows: Native ANSI console support
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 13:44:04 -07:00
d795bc7d53
Modify IPAMConfig structure json tags
...
- So that it complies with docker convention for inspect
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-30 12:57:49 -07:00
78bd17e805
Force IPC mount to unmount on daemon shutdown/init
...
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm
mounts, force it... but only on daemon init and shutdown.
This makes sure that these IPC mounts are cleaned up even when the
daemon is killed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-30 15:41:48 -04:00
e41eae8b42
fix a race in json logger reader
...
The json decoder starts to decode immediately an inotify event is
received.
But at the time the inotify event is trigged, the json log
entry might haven't been fully written to the disk.
In this case the decoder will return an "io.UnexpectedEOF" error, but
there is still data remaining in the decoder's buffer. And the data
should be passed to the decoder when the next inotify event is
triggered.
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-31 02:28:23 +08:00
0aa3bff482
Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild
...
Build broken on master (awslogs)
2015-10-30 10:39:48 -07:00
17a8fbeaeb
Merge pull request #17514 from mavenugo/ugr
...
Fixing a case of dangling endpoint during ungraceful daemon restart
2015-10-30 13:38:27 -04:00
ecb87ed0a5
Don't set mem soft limit if not specifiecd
...
You cannot do this for individual cgroups for all the containers. Only
set the reservation if the user requested it. The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-10-30 10:34:01 -07:00
2716e3964d
Windows build broken on master (awslogs)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 10:02:32 -07:00
c545dce004
Merge pull request #16640 from samuelkarp/awslogs-logging-driver
...
[awslogs] Auto-detect region and set user-agent
2015-10-30 12:38:40 -04:00
aadae4b503
Merge pull request #16412 from Microsoft/10662-hyper-v-containers
...
Windows [TP4]: Adds support for Hyper-V Containers
2015-10-30 09:34:16 -07:00
cf02b369e0
Use json.Encoder for container.toDisk
...
* for simmetry with fromDisk
* it might be slightly better for GC because of internal sync.Pool
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-30 09:29:53 -07:00
e990eca1e5
Merge pull request #17510 from LK4D4/refactor_shutdown
...
Refactor Shutdown a little to reduce indentation
2015-10-30 12:24:03 +01:00
6b9de7342f
Merge pull request #17498 from LK4D4/fix_graph_comment
...
Fix Graph() docstring
2015-10-30 09:48:16 +01:00
81c5b1ce4a
Merge pull request #17492 from aidanhs/aphs-remove-dead-code
...
Remove dead code
2015-10-30 08:50:54 +01:00
0c07096b7d
Fixes a case of dangling endpoint during ungraceful daemon restart
...
When a container restarts after a ungraceful daemon restart, first
cleanup any unclean sandbox before trying to allocate network resources.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-29 18:56:56 -07:00
ace5854f65
Refactor Shutdown a little to reduce indentation
...
Also make daemon.netController.Stop() regardless of container existance.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-29 17:20:32 -07:00
82203d06eb
Merge pull request #17497 from LK4D4/put_err
...
Do not ignore errors from graphdriver.Put
2015-10-29 19:37:10 -04:00
15e35c4470
Windows: Adds support for Hyper-V Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-29 16:18:52 -07:00
7f7950aa18
Merge pull request #17490 from aboch/pm
...
Libnetwork vendoring & overlay networking fixes
2015-10-29 13:45:19 -07:00
cdfd9846f4
Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
...
Fix rmi -f removing multiple tags
2015-10-29 13:01:06 -07:00
e03daebb48
Execute buildPortMapInfo after Endpoint.Join()
...
- As the retrieved info may not be available at
Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-29 11:47:30 -07:00
134772f91e
Fix Graph() docstring
...
It's not true anymore, it used in builder for example.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-29 11:41:42 -07:00
ac4b290552
Do not ignore errors from graphdriver.Put
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-29 11:25:53 -07:00
164d0bca63
Remove dead code
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-10-29 16:56:29 +00:00
de1d611990
Add show error when attach to a paused container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-28 21:00:09 -04:00
0e1618db19
Merge pull request #17437 from LK4D4/put_error
...
Do not ignore error from driver.Put
2015-10-28 17:32:03 -07:00
48e7f7963e
Fix rmi -f removing multiple tags
...
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-10-28 16:07:02 -07:00
990655448d
Remove unnecessary error returns
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 15:15:22 -07:00
54d42f4a10
Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value
...
Fix docker inspect display odd gateway value for none network mode
2015-10-28 13:39:59 -07:00
bc09eceaf4
Do not ignore error from driver.Put
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-28 06:54:09 -07:00
7fa601adc7
Fix docker inspect display odd gateway value for none network mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-27 21:47:12 -04:00
b227d19cae
Merge pull request #17423 from cpuguy83/so_sensitive
...
Revert "dockerversion placeholder for library-import"
2015-10-27 18:32:18 -07:00
b78ca243d9
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86
2015-10-27 21:23:53 -04:00
9ab71b68af
Merge pull request #17393 from tiborvass/carry-17360
...
Carry Fix docker inspect container only reports last assigned information
2015-10-27 17:00:41 -07:00
8a6dfb26f3
[awslogs] Auto-detect region on EC2 instances
...
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-10-27 23:47:28 +00:00
480c9c0178
[awslogs] Set User-Agent for Amazon CloudWatch Logs
...
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-10-27 23:47:19 +00:00
70083e6fc3
Update vendored aws-sdk-go
...
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-10-27 23:43:51 +00:00
25682577c9
Extract network settings types for inspect.
...
Keeping backwards compatibility.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-27 19:16:21 -04:00
6276c676a8
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
85ae8b034a
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
2015-10-27 13:29:18 -07:00
82f70677b9
Merge pull request #17405 from LK4D4/cont_pointer
...
Return pointer from newBaseContainer
2015-10-27 13:27:10 -07:00
1b9a08e719
Fix docker inspect container only reports last assigned information
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-27 16:26:06 -04:00
2b1b7823e6
Merge pull request #17406 from LK4D4/ent_and_args_simple
...
Simplify getEntrypointAndArgs
2015-10-27 13:24:59 -07:00
64854277f8
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
2015-10-27 13:21:15 -07:00
194b64951a
Merge pull request #17230 from aboch/ae
...
Do not update etc/hosts file for every container
2015-10-27 16:14:44 -04:00
d5cd032a86
dockerversion placeholder for library-import
...
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
3e7db73b99
Enhancing --cluster-advertise to support <interface-name>
...
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it automation friendly using
docker-machine.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-27 11:03:22 -07:00
5f6d27ceba
Simplify getEntrypointAndArgs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:36:11 -07:00
6d9bb99c97
Return pointer from newBaseContainer
...
It makes code more consistent.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-27 09:05:28 -07:00
b72a431928
Merge pull request #17389 from tonistiigi/15995-duplicate-names
...
Fix duplicate container names conflict
2015-10-27 02:42:50 -04:00
4f6f00e191
Do not update etc/hosts for every container
...
- Only user named containers will be published into
other containers' etc/hosts file.
- Also block linking to containers which are not
connected to the default network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-26 20:08:57 -07:00
aee5486374
Fix duplicate container names conflict
...
While creating multiple containers the second
container could remove the first one from graph
and not produce an error.
Fixes #15995
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-10-26 16:57:50 -07:00
fe1e04a84f
Merge pull request #17285 from Microsoft/10662-exectp4workaround
...
Windows [TP4] Trap Hyper-V exec failure
2015-10-26 16:47:51 -07:00
4cbe227db8
Merge pull request #17378 from Microsoft/10662-unmountwithsyscall
...
Windows: Volumes PR rename UnmountWithSyscall
2015-10-26 16:15:00 -07:00
3f11360a54
Merge pull request #17384 from mavenugo/42def
...
Simple Info log to indicate the chosen IP Address for the default bridge
2015-10-26 19:11:56 -04:00
126d1b6ca1
Simple log to indicate the chosen IP Address for the default bridge
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-26 14:46:08 -07:00
b1220a763c
Windows: Refactor resources structure
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 13:48:16 -07:00
853f2e9952
Windows: Volumes PR fix one of Tibors nits
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 13:34:49 -07:00
5087e8c2e8
Merge pull request #17180 from rhatdan/destroy
...
Docker is calling cont.Destroy twice on success
2015-10-26 15:48:04 -04:00
be1c77595e
Disable built-in SD on docker0 network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-23 19:46:28 -07:00
8d4888df90
Merge pull request #16488 from splunk/splunk_log_driver
...
Add Splunk logging driver #16207
2015-10-23 18:22:14 -07:00
8e0bbb2898
Add libnetwork call on daemon rename
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2015-10-23 16:26:24 -07:00
e74cf8acad
Merge pull request #16433 from Microsoft/10662-volumes5
...
Windows: [TP4] Add volume support
2015-10-23 18:43:07 -04:00
1f1dbf312d
Add Splunk logging driver #16207
...
Allow to send Splunk logs using Http Event Collector
Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-10-23 13:37:53 -07:00
2e56e78caf
Windows [TP4] Trap Exec Hyper-V Cont error
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-23 08:42:24 -07:00
2afdc6582b
Merge pull request #17274 from aboch/ai
...
Turn off discovery when icc == false
2015-10-22 13:08:31 -07:00
20faaaa872
Turn off service discovery when icc==false
...
- Turn off built-in service discovery on docker0 bridge
when icc is false
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-22 12:02:02 -07:00
a7e686a779
Windows: Add volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-22 10:42:53 -07:00
70af70aa0b
Merge pull request #17220 from calavera/fix_double_removal
...
Do not fail when a container is being removed and we request its delete again.
2015-10-21 13:57:16 -07:00
56ef47e881
Merge pull request #16890 from runcom/perf-boost
...
rmi and build cache miss performance improvements
2015-10-21 16:00:25 -04:00
94a16c81f4
Merge pull request #17245 from dhiltgen/discovery_tls
...
Wire up libnetwork with TLS discovery options
2015-10-21 15:20:24 -04:00
8247eff8a8
Merge pull request #17213 from calavera/volume_driver_validate_name
...
Validate volume names for the local driver.
2015-10-21 11:48:54 -07:00
678acbcb3f
Merge pull request #16992 from burke/fix-mqueue
...
Fix --ipc=host dependency on /dev/mqueue existing
2015-10-21 11:25:37 -07:00
10e7806984
Wire up libnetwork with TLS discovery options
...
This change exposes the TLS configuration settings to libnetwork so it can
communicate with a key/value store that has been set up with mutual TLS.
TLS options were introduced with https://github.com/docker/docker/pull/16644
Libnetwork support was introduced with https://github.com/docker/libnetwork/pull/602
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-21 09:38:58 -07:00
d6d60287ee
Move volume name validation to the local driver.
...
Delegate validation tasks to the volume drivers. It's up to them
to decide whether a name is valid or not.
Restrict volume names for the local driver to prevent creating
mount points outside docker's volumes directory.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-21 12:28:26 -04:00
f9e81b40f4
daemon: faster image cache miss detection
...
Lookup the graph parent reference to detect a builder cache miss before
looping the whole graph image index to build a parent-children tree.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-21 17:13:45 +02:00
56f5e3459f
graph: add parent img refcount for faster rmi
...
also fix a typo in pkg/truncindex package comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-21 17:13:45 +02:00
78e2167976
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
2015-10-20 19:45:08 -04:00
c4e49d1014
Do not fail when a container is being removed and we request its delete again.
...
Abort the process and return a success response, letting the original
request finish its job.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-20 18:48:34 -04:00
c516aa645e
Merge pull request #17177 from runcom/bc-fixes
...
Return empty Config fields, now omitempty, for API < 1.21
2015-10-20 16:39:53 -04:00
27f908a051
Do not mask ipam driver if no ip config is passed
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-20 11:19:37 -07:00
7777c1be9b
Merge pull request #17176 from rhvgoyal/fix-locking-issue
...
devmapper: Drop devices lock before returning from function
2015-10-20 13:08:29 -04:00
609961ddcc
validate the name of named volume
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-10-20 12:36:04 -04:00
ad861876e8
Merge pull request #17035 from estesp/fix-build-dir-perms
...
Correct build-time directory creation with user namespaced daemon
2015-10-20 08:57:19 -07:00
566964bf73
Merge pull request #17191 from mrjana/restart
...
Fix docker startup failure due to dangling endpoints
2015-10-20 10:32:33 -04:00
ae8c004dc1
Correct build-time directory creation with user namespaced daemon
...
This fixes errors in ownership on directory creation during build that
can cause inaccessible files depending on the paths in the Dockerfile
and non-existing directories in the starting image.
Add tests for the mkdir variants in pkg/idtools
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-20 08:59:48 -04:00
8adfc7e2d2
Fix docker startup failure due to dangling endpoints
...
Fixes docker startup failure due to dangling endpoints
which makes docker to not come up.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-19 21:29:35 -07:00
48147d287b
Merge pull request #17187 from mavenugo/dopts
...
Fail the container start if the network has been removed
2015-10-19 17:12:07 -07:00
8755920d0d
Fail the container start if the network has been removed
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-19 15:00:07 -07:00
2f16895ee9
devmapper: Drop devices lock before returning from function
...
cleanupDeleted() takes devices.Lock() but does not drop it if there are
no deleted devices. Hence docker deadlocks if one is using deferred
device deletion feature. (--storage-opt dm.use_deferred_deletion=true).
Fix it. Drop the lock before returning.
Also added a unit test case to make sure in future this can be easily
detected if somebody changes the function.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-10-19 17:51:17 -04:00
ab495ab0d0
Use more clear message for icc=false + iptables=false
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-19 14:19:21 -07:00
82a8a14c4d
Merge pull request #17128 from calavera/network_controller_enabled
...
Do not initialize the networking routes when netController is not enabled.
2015-10-19 16:13:31 -04:00
0c518b6ab2
Docker is calling cont.Destroy twice on success
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-10-19 14:53:55 -04:00
eb982e7c00
Return 404 for all network operations without network controller.
...
This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-19 14:40:18 -04:00
850bc0838a
Return empty Config fields, now omitempty, for API < 1.21
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-19 19:09:36 +02:00
Aidan Hobson Sayers
Stefan Scherer
David Calavera
Michael Crosby
Vincent Demeester
Antonio Murdaca
Wen Cheng Ma
NIWA Hideyuki
Alexander Morozov
Vivek Goyal
Kamil Domański
John Howard
Alexander Morozov
Kenjiro Nakayama
Darren Stahl
Tibor Vass
Kunal Kushwaha
Sebastiaan van Stijn
daehyeok mun
Vincent Demeester
Olle Jonsson
Antonio Murdaca
Anusha Ragunathan
unclejack
Aaron Lehmann
Denis Gladkikh
Brian Goff
Arnaud Porterie
Dan Walsh
Alessandro Boch
Ma Shimiao
Vincent Batts
mqliang
Lei Jitang
Doug Davis
Shijiang Wei
Bryan Boreham
Antonio Murdaca
Santhosh Manohar
Tonis Tiigi
Solomon Hykes
Zhang Wei
Jess Frazelle
Stefan J. Wernli
Sally O'Malley
Jana Radhakrishnan
Madhu Venugopal
Alexandre Beslic
Donald Huang
Derek McGowan
Samuel Karp
Phil Estes
Daniel Hiltgen
xlgao-zju
Phil Estes