clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,023 Commits 9 Branches 112 Tags
ffc499dbabdef0cdfeb5e71b96b445efa6f12c2e
Commit Graph
915 Commits
Author SHA1 Message Date
Alexandr Morozov a00a1a1fca Try other port on any error from Map 
Sometimes other programs can bind on ports from our range, so we just
skip this ports on allocation.

Fixes #9293
Probably fixes #8714

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-01 16:26:30 -08:00
Brian Goff c8a3d31332 Check for no Cmd on exec create endpoint 
Fixes #9414

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-12-01 17:54:15 -05:00
Jessie Frazelle bdaf562b4c Merge pull request #9438 from crosbymichael/label-std-mounts 
Label std mounts
 2014-12-01 14:37:42 -08:00
Michael Crosby 305e9cd2fa Label standard mounts within loop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-12-01 14:54:14 -05:00
Blake Geno 9200fdd197 remove obsolete workaround 
Signed-off-by: Blake Geno <blakegeno@gmail.com>
 2014-12-01 11:44:13 -05:00
Vincent Batts b47ff77b5c Merge pull request #9006 from snitm/thin-pool-improvements 
Thin pool improvements
 2014-11-26 14:44:09 -05:00
Jessie Frazelle 00c2a8f323 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
 2014-11-25 18:03:51 -08:00
Doug Davis 90928eb114 Add support for docker exec to return cmd exitStatus 
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.

Closes #8703

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-25 17:49:25 -08:00
Dan Walsh 61b2766e75 Label content created for containers with the private label 
Currently this content gets a system label and is not writable based on
SELinux controls.  This patch will set the labels to the correct label.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-11-25 14:12:26 -05:00
Tatsushi Inagaki 82a5cd0d37 Fix to avoid a compilation error of size_test.go with GCCGO due to float to int truncation 
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com>
 2014-11-25 18:12:22 +09:00
Mike Snitzer b9f1b0a751 devmapper: cleanup some extraneous branching in setupBaseImage() 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
 2014-11-24 20:06:41 -05:00
unclejack 209deff963 don't call reexec.Init from chrootarchive 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/graphdriver/aufs/aufs_test.go
		fixed conflict caused by imports
 2014-11-25 01:03:40 +02:00
unclejack 1cb17f03d0 add pkg/chrootarchive and use it on the daemon 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	builder/internals.go
	daemon/graphdriver/aufs/aufs.go
	daemon/volumes.go
		fixed conflicts in imports
 2014-11-25 01:03:40 +02:00
Michael Crosby fa1484d12c Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-25 01:03:40 +02:00
Michael Crosby 294843ef23 Move security opts to HostConfig 
These settings need to be in the HostConfig so that they are not
committed to an image and cannot introduce a security issue.

We can safely move this field from the Config to the HostConfig
without any regressions because these settings are consumed at container
created and used to populate fields on the Container struct.  Because of
this, existing settings will be honored for containers already created
on a daemon with custom security settings and prevent values being
consumed via an Image.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	daemon/create.go
		changing config to hostConfig was required to fix the
		 build
 2014-11-25 01:02:30 +02:00
Jessie Frazelle 39284be960 Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api 
Cleanup exec API docs and available params
 2014-11-24 13:35:45 -08:00
Jessie Frazelle c59b308b6b Merge pull request #9223 from vbatts/vbatts-overlay_notfound 
overlayfs: more helpful output when not supported
 2014-11-21 19:58:01 -08:00
Mike Snitzer 553b50bd37 devmapper: remove unnecessary else branch in getPoolName() 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
 2014-11-21 21:36:23 -05:00
Brian Goff d4ba00bd42 Cleanup exec API docs and available params 
Adds pertitent information about what is expected in the json payload
and comments out unsupported (exec) features in runConfig.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-11-21 21:11:07 -05:00
Michael Crosby f8509e7940 Mknod more loopbacks for devmapper 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-21 16:20:35 -08:00
Michael Crosby c78bf8d86a Merge pull request #9265 from vieux/daemon_labels 
add daemon labels (displayed in docker info)
 2014-11-21 15:14:27 -08:00
Vincent Batts a43ee077dc Merge pull request #9149 from swagiaal/fix-configureBridge-comment 
Remove reference to 'ifaceName' from configureBridge comment.
 2014-11-21 16:37:28 -05:00
Victor Vieux 62a7d75512 key=values -> key=value 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-21 19:15:22 +00:00
Alexander Morozov 0f2de5158f Merge pull request #9261 from unclejack/fix_test_tmp_cleanup 
fix cleanup of /tmp in tests
 2014-11-21 08:48:04 -08:00
unclejack 4180579313 graphdriver/aufs: fix tmp cleanup in tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-21 18:31:45 +02:00
Jessica Frazelle f6c7194539 Apply same typed iptables errors to network driver. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-11-20 18:07:15 -08:00
Michael Crosby 4acdb7ddc7 Merge pull request #9260 from LK4D4/increase_proxy_timeout 
Increase timeout for userland proxy starting
 2014-11-20 14:20:31 -08:00
Victor Vieux 2fe36baa0a add daemon labels 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 19:23:58 +00:00
Tibor Vass 998b591a71 Merge pull request #9201 from vieux/add_hostname_docker_info 
Add hostname and ID docker info
 2014-11-20 13:11:16 -05:00
Victor Vieux 227f4bbdb3 Hostname -> Name 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 17:40:08 +00:00
Alexandr Morozov 72c55e8215 Increase timeout for userland proxy starting 
Fixes #8883

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-11-20 09:02:42 -08:00
Tonis Tiigi 6705477673 Fix misuses of format based logging functions 
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-11-19 23:59:02 +02:00
Vincent Batts 3287ca1e45 overlayfs: more helpful output when not supported 
based on https://github.com/docker/docker/pull/7619#discussion_r20385086

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2014-11-18 22:53:04 -05:00
Michael Crosby 1bac8f5322 Merge pull request #9039 from ashahab-altiscale/8617-lxc-volume 
Have lxc create mount points if they don't exist
 2014-11-18 17:24:16 -08:00
Jessica Frazelle ac40e7cbb3 Fix for rmi -f when error "no such id". (9056) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-11-17 17:04:10 -08:00
Victor Vieux 9a85f60c75 add ID and Hostname in docker info 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-17 19:23:41 +00:00
Arnaud Porterie 34cb92e2d4 Merge pull request #8699 from shuai-z/fix-portalloc 
Fix corner cases in ipallocator and portallocator
 2014-11-16 22:10:40 -08:00
Alexandr Morozov 61e4b4e1d0 Merge pull request #8335 from duglin/Issue5198 
Add --log-level support - Issue #5198
 2014-11-15 10:53:31 -08:00
Doug Davis 2facc04673 Add --log-level support 
Next steps, in another PR, would be:
- make all logging go through the logrus stuff
- I'd like to see if we can remove the env var stuff (like DEBUG) but we'll see

Closes #5198

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-15 09:00:48 -08:00
Ahmet Alp Balkan b64c9b521a Extract TreeSize to daemon build 
TreeSize uses syscall.Stat_t which is not available on Windows.
It's called only on daemon path, therefore extracting it to daemon
with build tag 'daemon'

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
 2014-11-14 18:20:53 -08:00
Michael Crosby 8682bac309 Merge pull request #9151 from tonistiigi/aufs-clipping-fix 
Fix AUFS silent mount errors on many layers
 2014-11-14 17:35:07 -08:00
Tibor Vass 36503981f0 Merge pull request #9100 from tiborvass/insecure-registry-cidr 
Add the possibility of specifying a subnet for --insecure-registry
 2014-11-14 13:45:48 -08:00
Michael Crosby 25643f8932 Merge pull request #9172 from vbatts/vbatts-dm_maintainer 
pkg/devicemapper: missed MAINTAINERS on split
 2014-11-14 13:29:34 -08:00
unclejack 916a10dd91 Merge pull request #7619 from alexlarsson/overlayfs 
Add overlayfs graph backend
 2014-11-14 22:59:59 +02:00
Tibor Vass 6aba75db4e Add the possibility of specifying a subnet for --insecure-registry 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-14 12:31:11 -08:00
Michael Crosby 07996d82c7 Merge pull request #9074 from rhatdan/shm 
Allow IPC namespace to be shared between containers or with the host
 2014-11-14 10:34:00 -08:00
Brian Goff 7107898d5c Initialize volumes when container is created 
Fixes #8942
Current behavior is that volumes aren't initialized until start.
Volumes still need to be initialized on start since VolumesFrom and
Binds can be passed in as part of HostConfig on start, however anything
that's already been initialized will just be skipped as is the current
behavior.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-11-14 11:37:03 -05:00
Vincent Batts 3ec623ee2f pkg/devicemapper: missed MAINTAINERS on split 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-14 11:12:23 -05:00
Jessie Frazelle 870a695375 Merge pull request #9011 from vbatts/vbatts-btrfs_information 
btrfs: information for the information gods
 2014-11-13 20:47:07 -08:00
Michael Crosby 5c863f983d Merge pull request #9107 from ashahab-altiscale/9062-linked-container 
Share network namespace of containers with lxc
 2014-11-13 18:25:38 -08:00