p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,923 Commits 2 Branches 295 Tags
996111b8d39ffbf6be0aac5d880acaa38fb4bdca
Commit Graph

727 Commits

Author SHA1 Message Date
Sven Dowideit
996111b8d3 Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc 
Try out a different phrase for --icc
Upstream-commit: 8dfcbf62edb2853176eb3f5cf077dae68f2e85c3
Component: engine
 2014-12-05 16:22:51 +10:00
Michael Crosby
ac96967ba9 Use consistent ApplyLayer in overlayfs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f47d6b9b9de8c567e9e42e12243cbcce99a7bfc7
Component: engine
 2014-12-04 12:03:44 -08:00
Jessie Frazelle
e1ce0e0de9 Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create 
Initialize volumes when container is created
Upstream-commit: 67fda331973fdd23f3da79588ea899dc577f46e8
Component: engine
 2014-12-03 15:42:09 -08:00
Michael Crosby
576cfafbf2 Merge pull request #9426 from lhuard1A/overlay_rename 
Rename overlayfs to overlay
Upstream-commit: 5d49d2bb7a3bafcd1481a05d56ebc39ecd394393
Component: engine
 2014-12-03 10:57:42 -08:00
Lénaïc Huard
d0fa330b7f Remove the last references to overlayfs 
This only renames docker internal structures.
It has no impact on the end-user.

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: 2352f00e4ff2cd102a4d591d67aba8e1c7eaa7b6
Component: engine
 2014-12-03 14:06:19 +01:00
Lénaïc Huard
34e4a16b13 Rename the overlay storage driver 
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: d680ca5c96484474757fb6f92274f47bf1520631
Component: engine
 2014-12-03 13:57:23 +01:00
Sven Dowideit
215ea5a487 fixes as per feedback 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 070a519a9b972ffffda62b82fbc27825d4a6f9b0
Component: engine
 2014-12-03 12:46:23 +10:00
Sven Dowideit
7045c111d6 Try out a different phrase for --icc 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 94d67d5d5b300c346e17503810d521c91db89c14
Component: engine
 2014-12-03 12:46:23 +10:00
Michal Minar
d67f32cdc7 Man: describe --icc option better 
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
Upstream-commit: a61a4a31882335020cfbffc49ffe274847a5c803
Component: engine
 2014-12-03 12:46:16 +10:00
Jessie Frazelle
dd2a47a55c Merge pull request #9457 from icecrime/engine_logf 
Remove unused Engine.Logf method
Upstream-commit: 906c7211e6965a29b538e93af3ade981000dff98
Component: engine
 2014-12-02 12:17:11 -08:00
Arnaud Porterie
dabbee5901 Remove unused Engine.Logf 
The `Engine.Logf` method was unused and confusing.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 59da197de8f040eed7560747476f97ce8afad293
Component: engine
 2014-12-02 10:47:57 -08:00
Alexander Morozov
fdf7191cae Merge pull request #9435 from cpuguy83/9414_fix_exec_api_error_no_cmd 
Check for no `Cmd` on exec create endpoint
Upstream-commit: 50445e4d0c622837f1dd9bd5b3810d3b309b7d18
Component: engine
 2014-12-02 10:28:44 -08:00
Michael Crosby
b775e7f418 Merge pull request #9441 from LK4D4/retry_any_error_on_portmap 
Try other port on any error from Map
Upstream-commit: e40bbf3b9a408b3e51e837ca1828237f860011b9
Component: engine
 2014-12-02 09:51:50 -08:00
Lénaïc Huard
506a27fa45 Rename overlayfs to overlay 
Since Linux 3.18-rc6, overlayfs has been renamed overlay.

This change was introduced by the following commit in linux.git:
ef94b1864d1ed5be54376404bb23d22ed0481feb ovl: rename filesystem type to "overlay"

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: c57317893a743720a241ae328d1bdf7bd02b1fea
Component: engine
 2014-12-02 10:02:59 +01:00
Alexandr Morozov
9254581bd3 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>
Upstream-commit: a00a1a1fca020d21cb677439160e018bda5c3835
Component: engine
 2014-12-01 16:26:30 -08:00
Brian Goff
67d69faf00 Check for no Cmd on exec create endpoint 
Fixes #9414

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c8a3d31332074ddc226086ff1f0c042b6e120232
Component: engine
 2014-12-01 17:54:15 -05:00
Jessie Frazelle
d061fa172b Merge pull request #9438 from crosbymichael/label-std-mounts 
Label std mounts
Upstream-commit: bdaf562b4c23feda1f8e790ad456d9bbf982e0af
Component: engine
 2014-12-01 14:37:42 -08:00
Michael Crosby
e178f59d16 Label standard mounts within loop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 305e9cd2fab974c38064a1acd2ef1f552a3a1357
Component: engine
 2014-12-01 14:54:14 -05:00
Blake Geno
9bbfd296f7 remove obsolete workaround 
Signed-off-by: Blake Geno <blakegeno@gmail.com>
Upstream-commit: 9200fdd197f7c80c495597104928596516b36f41
Component: engine
 2014-12-01 11:44:13 -05:00
Vincent Batts
7b6399d928 Merge pull request #9006 from snitm/thin-pool-improvements 
Thin pool improvements
Upstream-commit: b47ff77b5ce852bd830bc617d1c4e2c37e346281
Component: engine
 2014-11-26 14:44:09 -05:00
Jessie Frazelle
3253386751 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
 2014-11-25 18:03:51 -08:00
Doug Davis
c28ef478d3 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>
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
 2014-11-25 17:49:25 -08:00
Dan Walsh
0896bd3b29 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)
Upstream-commit: 61b2766e758f21b8b6bd32dc82ba624c2f0c5fd6
Component: engine
 2014-11-25 14:12:26 -05:00
Mike Snitzer
c836e22634 devmapper: cleanup some extraneous branching in setupBaseImage() 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
Upstream-commit: b9f1b0a7514c6e40e7048fb9206001259eb7c33c
Component: engine
 2014-11-24 20:06:41 -05:00
unclejack
8fc694c819 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
Upstream-commit: 209deff9633b82198925846ebcb0a02191553005
Component: engine
 2014-11-25 01:03:40 +02:00
unclejack
dd4a9e5429 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
Upstream-commit: 1cb17f03d0b217acf2d2c289b4946d367f9d3e80
Component: engine
 2014-11-25 01:03:40 +02:00
Michael Crosby
3527869dfc Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: fa1484d12c5b66f7db03a9c93002ba3df56cdb4e
Component: engine
 2014-11-25 01:03:40 +02:00
Michael Crosby
8c7a6654fa 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
Upstream-commit: 294843ef23fcff3c080d9fbd12df17ae7006a9f8
Component: engine
 2014-11-25 01:02:30 +02:00
Jessie Frazelle
d700b94cc1 Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api 
Cleanup exec API docs and available params
Upstream-commit: 39284be960d3d528ecf3faaa7900f4718e959c06
Component: engine
 2014-11-24 13:35:45 -08:00
Jessie Frazelle
8bf9a8d42c Merge pull request #9223 from vbatts/vbatts-overlay_notfound 
overlayfs: more helpful output when not supported
Upstream-commit: c59b308b6b2fc8112a93d64f4922b0ece01a4e6a
Component: engine
 2014-11-21 19:58:01 -08:00
Mike Snitzer
b28ed4ddea devmapper: remove unnecessary else branch in getPoolName() 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
Upstream-commit: 553b50bd37ade60bfafe5d5cc10f984251741f44
Component: engine
 2014-11-21 21:36:23 -05:00
Brian Goff
1f85619ac6 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>
Upstream-commit: d4ba00bd4237ebf6e8016a350d95cc060e5e8a05
Component: engine
 2014-11-21 21:11:07 -05:00
Michael Crosby
0c37aeb40b Mknod more loopbacks for devmapper 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f8509e7940d73ecc0071faf15a865acb1f8dad52
Component: engine
 2014-11-21 16:20:35 -08:00
Michael Crosby
21eb3ab253 Merge pull request #9265 from vieux/daemon_labels 
add daemon labels (displayed in docker info)
Upstream-commit: c78bf8d86a912adafa0c2514e9224431a887b197
Component: engine
 2014-11-21 15:14:27 -08:00
Vincent Batts
95c96f42c9 Merge pull request #9149 from swagiaal/fix-configureBridge-comment 
Remove reference to 'ifaceName' from configureBridge comment.
Upstream-commit: a43ee077dca75d0e8f198275db17eac341b0ca8c
Component: engine
 2014-11-21 16:37:28 -05:00
Victor Vieux
eec853d8c5 key=values -> key=value 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 62a7d75512d939a86cbc58986278548df3302902
Component: engine
 2014-11-21 19:15:22 +00:00
Alexander Morozov
8d3c39cea7 Merge pull request #9261 from unclejack/fix_test_tmp_cleanup 
fix cleanup of /tmp in tests
Upstream-commit: 0f2de5158fe66b4906de176f90e3e6d813336450
Component: engine
 2014-11-21 08:48:04 -08:00
unclejack
2388eefc7e graphdriver/aufs: fix tmp cleanup in tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4180579313e84ea7e3d85214521a815e95459a90
Component: engine
 2014-11-21 18:31:45 +02:00
Jessica Frazelle
c878d4a442 Apply same typed iptables errors to network driver. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f6c7194539720473aae814d3d1445eab2a78d568
Component: engine
 2014-11-20 18:07:15 -08:00
Michael Crosby
b0f41baab2 Merge pull request #9260 from LK4D4/increase_proxy_timeout 
Increase timeout for userland proxy starting
Upstream-commit: 4acdb7ddc7f10cd707d02ca88317056e988b2abb
Component: engine
 2014-11-20 14:20:31 -08:00
Victor Vieux
35fec2c425 add daemon labels 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2fe36baa0a39840e64f1dc585af41b5ee0ed6df5
Component: engine
 2014-11-20 19:23:58 +00:00
Tibor Vass
fa056c1bc9 Merge pull request #9201 from vieux/add_hostname_docker_info 
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
 2014-11-20 13:11:16 -05:00
Victor Vieux
addb2d43fa Hostname -> Name 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Component: engine
 2014-11-20 17:40:08 +00:00
Alexandr Morozov
a47630e4a6 Increase timeout for userland proxy starting 
Fixes #8883

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 72c55e82156843c73ab1405b565e63d947b66c10
Component: engine
 2014-11-20 09:02:42 -08:00
Tonis Tiigi
a3eaed6ca5 Fix misuses of format based logging functions 
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: 6705477673be7c303369778f6f288ee600ce3893
Component: engine
 2014-11-19 23:59:02 +02:00
Vincent Batts
65e57f8b27 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>
Upstream-commit: 3287ca1e45f74a2eac214070ccb937c7c7030a06
Component: engine
 2014-11-18 22:53:04 -05:00
Michael Crosby
ef9c1a57f6 Merge pull request #9039 from ashahab-altiscale/8617-lxc-volume 
Have lxc create mount points if they don't exist
Upstream-commit: 1bac8f5322b1ec300326a7eaac18f712c385b5b2
Component: engine
 2014-11-18 17:24:16 -08:00
Jessica Frazelle
12f949a058 Fix for rmi -f when error "no such id". (9056) 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac40e7cbb3cf01568b3763abe04af814d89a6f36
Component: engine
 2014-11-17 17:04:10 -08:00
Victor Vieux
f066184384 add ID and Hostname in docker info 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9a85f60c75f2017b14ed5e7f2bae5dc4961cb74c
Component: engine
 2014-11-17 19:23:41 +00:00
Arnaud Porterie
89f15328f3 Merge pull request #8699 from shuai-z/fix-portalloc 
Fix corner cases in ipallocator and portallocator
Upstream-commit: 34cb92e2d49e2c141a67cd5df73a54c1655b2842
Component: engine
 2014-11-16 22:10:40 -08:00