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

11680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
e22789790c Merge pull request #9174 from dqminh/docker-exec-env 
Set correct env variables for `docker exec` commands
Upstream-commit: 9a917e732c8f84f365b36a5a92bdb1f546a7e4d1
Component: engine
 2014-11-20 13:31:51 -08:00
Michael Crosby
f435c304cd Merge pull request #8251 from duglin/Issue2333 
Add support for ENV of the form: ENV name=value ...
Upstream-commit: 58b6f31a7a3157b5ece418da0a976a28dae9841d
Component: engine
 2014-11-20 13:12:24 -08: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
Daniel, Dao Quang Minh
9a648e0fc7 test case for preserving env in exec session 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 2bceaae42399ce33e8c724d1ac435eca6759637b
Component: engine
 2014-11-20 13:05:37 -05:00
Doug Davis
5dafd01fe8 Add support for ENV of the form: ENV name=value ... 
still supports the old form: ENV name value

Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \

Closes #2333

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1314e1586f8cd6201c16161eb960a743c727946b
Component: engine
 2014-11-20 09:54:28 -08:00
Victor Vieux
7a40da10bf update docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8ef36dcfe75752a5705813e2d9fa9359a8162b18
Component: engine
 2014-11-20 17:40:08 +00: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
Victor Vieux
4b4f9725e6 Update libtrust version 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6e92dfdfd843aec909572a405337efb25beb6f58
Component: engine
 2014-11-20 17:39:54 +00:00
Michael Crosby
21506f31ee Merge pull request #9226 from crosbymichael/container-net-test 
Add test for --net container:<id>
Upstream-commit: 739d917d7094db822ecfe927e1e934c3c8ec4047
Component: engine
 2014-11-19 17:57:45 -08:00
Michael Crosby
f35e467fb4 Merge pull request #9211 from mtesselH/login 
Fixed a bug - no panic anymore when logining in without TTY
Upstream-commit: d4ca9e5cce2ff7e08750123609df1864e0befdcf
Component: engine
 2014-11-19 17:52:35 -08:00
Michael Crosby
259b05fa1e Add test for --net container:<id> 
This adds an integration test for checking that the network namespace
fds are the same when a container joins another container's network
namespace.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 71209f75791fdc1a2124682f50cd00a413ddb143
Component: engine
 2014-11-19 17:43:04 -08:00
Michael Crosby
60406cf97c Merge pull request #9180 from chenchun/master 
Clean config path of bind mount volume
Upstream-commit: adc344dfdee7dd006f8855d7af83b00683b5660e
Component: engine
 2014-11-19 17:41:46 -08:00
Sven Dowideit
f169786708 Merge pull request #9191 from duglin/Issue8775 
Be clearer in docs about COPY/ADD dirs
Upstream-commit: 3e5cb0c84f390c2c939061ae34754e3924f82790
Component: engine
 2014-11-19 15:26:20 -08:00
Jessie Frazelle
6e30644aa7 Merge pull request #9251 from tonistiigi/use-format-logging-functions 
Fix misuses of format based logging functions
Upstream-commit: eb3bbde6d18bb35774cd3ab2c6eba0016f679d2b
Component: engine
 2014-11-19 15:25:42 -08:00
Sven Dowideit
e390ce1d8e Merge pull request #9144 from miminar/sigproxy_tty 
Corrected description of --sig-proxy
Upstream-commit: c7e6ad8e987d06385894ee8cd77fe2571ca9bb50
Component: engine
 2014-11-19 14:52:01 -08:00
Alexander Morozov
ee1e7b75b0 Merge pull request #9249 from tonistiigi/integration-cli-cleanup 
Make sure integration-cli tests clean up
Upstream-commit: bca63b4f48a48ec3918862a8fc094e949f42038d
Component: engine
 2014-11-19 14:27:13 -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
Tonis Tiigi
f428978f5b Fix deleteImages() helper for multiple names 
Pass every image name as separate argument.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: bbb245defe670f4fd9b9159b154e0ba5aa93ec87
Component: engine
 2014-11-19 23:42:16 +02:00
Tonis Tiigi
865600707c Make sure integration-cli test clean up 
Common patterns:
- Multiple images were built with same name but only one cleanup.
- Containers were deleted after images.
- Images not removed after retagging.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: da3d3b97ebe1e6fe1254367521c725ca12a5e61d
Component: engine
 2014-11-19 23:41:46 +02:00
Michal Minar
a18fff0f61 Updated sig-proxy text also in zsh completion script 
Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 1cd12efb5d0065990334de4f97fa85b317f97f11
Component: engine
 2014-11-19 09:09:42 +01:00
Sven Dowideit
de98d16e28 Merge pull request #9203 from somaopensource/fix_link 
fix link to PACKAGERS.md
Upstream-commit: c8926bb5792ebea6e7b16935fa7fce577446574a
Component: engine
 2014-11-18 18:23:33 -08:00
Chun Chen
018bd0f92c Clean config path of bind mount volume 
Signed-off-by: Chun Chen <chenchun.feed@gmail.com>
Upstream-commit: f4acfeebda431239c98e07ed8c0d55422e165d4e
Component: engine
 2014-11-19 10:13:10 +08:00
James Turnbull
461e426c89 Merge pull request #9219 from acbodine/cleanup-remote-api-docs-start 
Cleanup: fixes start response status code typo in examples
Upstream-commit: af54dc215f08ef1a56eaef54e8e4cc5e6f7d21a9
Component: engine
 2014-11-18 20:25:36 -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
Victor Vieux
5660f63578 Merge pull request #8905 from 13W/x-registry-auth 
allow to use x-registry-auth header with enabled cors
Upstream-commit: f676891192670df3e5c79c4612a86186329d658f
Component: engine
 2014-11-18 17:21:22 -08:00
Michael Crosby
7c799c6dee Merge pull request #9187 from icecrime/update_authors_file 
Update AUTHORS file
Upstream-commit: 0722c9b536a6f9617f77090bfc78b9c583a1b8d1
Component: engine
 2014-11-18 16:31:07 -08:00
Tianon Gravi
eb0584215a Merge pull request #9218 from tianon/check-overlayfs 
Add CONFIG_OVERLAYFS_FS to check-config.sh
Upstream-commit: e393ca672ed71ff778db284517593bab680a79c4
Component: engine
 2014-11-18 16:56:56 -07:00
Michael Crosby
3058d3242d Merge pull request #9216 from jfrazelle/typo-steam 
Fix steam where it should be stream.
Upstream-commit: ca4be114e9f8b38805f7f16f58fe2d8468c95bfe
Component: engine
 2014-11-18 15:29:33 -08:00
Jessie Frazelle
c334a2067e Merge pull request #8150 from dqminh/pull-output-non-terminal 
Pull: print some data instead of newlines when output is not a terminal
Upstream-commit: 9854b0aa40eb3261d599604915c909cebcc60179
Component: engine
 2014-11-18 16:20:42 -07:00
Andrew C. Bodine
01eaabb4bf Cleanup: fixes start response status code typo in examples 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
Upstream-commit: f9cdad32721808b6beeab544de26cca9ff68e1f0
Component: engine
 2014-11-18 11:32:51 -08:00
Tianon Gravi
87e8b60fe9 Add CONFIG_OVERLAYFS_FS to check-config.sh 
Also, added some slight adjustment to the AUFS_FS output/note to make it more clear what it applies to.

Example output:
```console
$ ./contrib/check-config.sh
info: reading kernel config from /proc/config.gz ...

Generally Necessary:
- cgroup hierarchy: properly mounted [/sys/fs/cgroup]
- CONFIG_NAMESPACES: enabled
- CONFIG_NET_NS: enabled
- CONFIG_PID_NS: enabled
- CONFIG_IPC_NS: enabled
- CONFIG_UTS_NS: enabled
- CONFIG_DEVPTS_MULTIPLE_INSTANCES: enabled
- CONFIG_CGROUPS: enabled
- CONFIG_CGROUP_CPUACCT: enabled
- CONFIG_CGROUP_DEVICE: enabled
- CONFIG_CGROUP_FREEZER: enabled
- CONFIG_CGROUP_SCHED: enabled
- CONFIG_MACVLAN: enabled
- CONFIG_VETH: enabled
- CONFIG_BRIDGE: enabled
- CONFIG_NF_NAT_IPV4: enabled
- CONFIG_IP_NF_FILTER: enabled
- CONFIG_IP_NF_TARGET_MASQUERADE: enabled
- CONFIG_NETFILTER_XT_MATCH_ADDRTYPE: enabled
- CONFIG_NETFILTER_XT_MATCH_CONNTRACK: enabled
- CONFIG_NF_NAT: enabled
- CONFIG_NF_NAT_NEEDED: enabled

Optional Features:
- CONFIG_MEMCG_SWAP: enabled
- CONFIG_RESOURCE_COUNTERS: enabled
- CONFIG_CGROUP_PERF: missing
- Storage Drivers:
  - "aufs":
    - CONFIG_AUFS_FS: missing
      (note that some kernels include AUFS patches but not the AUFS_FS flag)
    - CONFIG_EXT4_FS_POSIX_ACL: enabled
    - CONFIG_EXT4_FS_SECURITY: enabled
  - "btrfs":
    - CONFIG_BTRFS_FS: enabled
  - "devicemapper":
    - CONFIG_BLK_DEV_DM: enabled
    - CONFIG_DM_THIN_PROVISIONING: enabled
    - CONFIG_EXT4_FS: enabled
    - CONFIG_EXT4_FS_POSIX_ACL: enabled
    - CONFIG_EXT4_FS_SECURITY: enabled
  - "overlayfs":
    - CONFIG_OVERLAYFS_FS: missing
```

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 54a6e6d1229adb1169809493af89600c5ccc70ae
Component: engine
 2014-11-18 12:20:49 -07:00
Jessica Frazelle
1b2e957b5a Fix steam where it should be stream. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7fe8d0aeeb373a0fef92758819d8054fbd744ea5
Component: engine
 2014-11-18 10:49:01 -08:00
Doug Davis
9cd25b81c7 Be clearer in docs about COPY/ADD dirs 
COPY/ADD just copies the contents of dirs, not dirs themselves.
This PR tries to clear that up in the docs.

Closes #8775

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b4346c4810c4801e8885485b2bf0311f1b6d00ec
Component: engine
 2014-11-18 04:33:53 -08:00
James Turnbull
616801a125 Merge pull request #9189 from satnam6502/docfix 
Consistently use sudo docker
Upstream-commit: 660eadae3d56195e05da170593af50f0d7752706
Component: engine
 2014-11-18 01:17:48 -05:00
James Turnbull
2e6d4cf87e Merge pull request #9193 from somaopensource/docs_misspelling 
Fix misspelling
Upstream-commit: 4fff1505eb00cf679792b2e064dc1fa08a9c6587
Component: engine
 2014-11-18 01:16:27 -05:00
Marianna
16ad3a4d02 Fixed a bug - no panic anymore when logining in without TTY 
Fixes #8956

Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: e6fd57b90bcdd3b0105fa5c7d17a64332f829ded
Component: engine
 2014-11-17 19:41:27 -08:00
Michael Crosby
00bf60f5c4 Merge pull request #8937 from vbatts/vbatts-mount_optional_fields 
pkg/mount: include optional field
Upstream-commit: 379c0da4648f7a8d62740b5c217cfac58f45ca10
Component: engine
 2014-11-17 18:25:00 -08:00
Michael Crosby
569d615f97 Merge pull request #9204 from jfrazelle/9056-rmi 
Fix for rmi throws error "no such id".
Upstream-commit: 17dfa126baabb7300e4a5193689cde01ece24747
Component: engine
 2014-11-17 18:08:52 -08:00
Sven Dowideit
801f67cf03 Merge pull request #8749 from brahmaroutu/resize_uponstart_8728_2 
Fix the documentation and integration test for container resize
Upstream-commit: e2d08bd5ead101bdb58868492179f0bbe72547f3
Component: engine
 2014-11-17 17:24:58 -08:00
Satnam Singh
5f5c30608e Consistently use sudo docker 
Signed-off-by: Satnam Singh <satnam@raintown.org>
Upstream-commit: b273c447e0f0b124d5f81ff60033a4894e2acec8
Component: engine
 2014-11-17 17:14:39 -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
Jessie Frazelle
5d1b12a860 Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer 
makes the -s --size option documentation clearer #8950
Upstream-commit: 882db5f8858f36e213feabda459e6b5e639c5c85
Component: engine
 2014-11-17 17:42:27 -07:00
Jessie Frazelle
1dc17540ab Merge pull request #9205 from crosbymichael/update-libcontainer-nov17 
Update libcontainer to 28cb5f9dfd6f3352c610a4f1502
Upstream-commit: 3527d5b817637bea162cfc84b06534a4a20ca464
Component: engine
 2014-11-17 16:49:35 -07:00
Jessica Frazelle
b3efa18c2e Add test for bug (9056) where rmi -f fails with "no such id". 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a0605107d713f7f8a25277b06369134d17781077
Component: engine
 2014-11-17 15:12:55 -08:00
Vincent Batts
71912fc9e2 pkg/mount: testing mountinfo fields 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 83d7db3e505f2d080ac78ca7777937c812588003
Component: engine
 2014-11-17 16:17:06 -05:00
Michael Crosby
a531c55832 Update libcontainer to 28cb5f9dfd6f3352c610a4f1502 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 975fa5487ca531374fed421b52de1adf133c9810
Component: engine
 2014-11-17 12:16:37 -08:00
Daehyeok Mun
42d3bfe3e2 fix link to PACKAGERS.md 
fix link from /hack/PACKAGERS.md to /project/PACKAGERS.md

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: a3068a109cc2c472966d5a080f81ca344232f26c
Component: engine
 2014-11-18 05:03:00 +09:00
Jessie Frazelle
7caef96705 Merge pull request #9197 from somaopensource/remove_obsolete_comment 
Remove obsolete comments
Upstream-commit: ecaba0eb4abd5ad26eb07f7ac89a16b8914347fa
Component: engine
 2014-11-17 12:53:23 -07:00
Victor Vieux
9554f43a2c add docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8545155c41b1ccc22056733539660b1afa6790ef
Component: engine
 2014-11-17 19:26:43 +00: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