docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
21,804 Commits 12 Branches 296 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph

20395 Commits

Author SHA1 Message Date
David Calavera
e32ea4c0f9 Add network events. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f15af1eff75f920c956e7c437d1ef81f5c31129a
Component: engine
 2015-12-30 17:39:33 -05:00
David Calavera
e54bb2b509 Add volume events. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9d12d093009d3c4bf3bd4ebad3f8327c36d2d584
Component: engine
 2015-12-30 17:39:33 -05:00
David Calavera
3580481051 Add event types. 
- Stop serializing JSONMessage in favor of events.Message.
- Keep backwards compatibility with JSONMessage for container events.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 72f1881df102fce9ad31e98045b91c204dd44513
Component: engine
 2015-12-30 17:39:33 -05:00
Lei Jitang
75ad76df88 Add tests for docker events -f container. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 531ecf59f5bd92b12d4548617ca7bf179c8179a3)
Upstream-commit: 687ef0056204c487aa1a2aeb283e8bda37be74a1
Component: engine
 2015-12-30 17:39:32 -05:00
David Calavera
5af0a64a16 Move test out of the windows build. 
Because it can still run on windows server and fail because it doesn't
have `chown`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9aad7d209f8919726b40034a40e619f1efa46716
Component: engine
 2015-12-30 16:36:48 -05:00
Sebastiaan van Stijn
301494dba6 Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2 
Fix docs for memory-swap
Upstream-commit: 2c3d1a9b126d45647cfe8aa89008a93f83203a0c
Component: engine
 2015-12-30 21:01:48 +01:00
Tonis Tiigi
9cbaaf7f9f Fix missing comment in docker inspect 
Fixes #18571

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d32f43013bf4c3aaa90c9ea409fbb9ade4105200
Component: engine
 2015-12-30 11:52:53 -08:00
David Calavera
cd2f0504b4 Merge pull request #18158 from mauri/add_owner 
ADD files to a folder doesn't set correct UID and GID
Upstream-commit: 56f8b051ebc423b188c4a9eb8c151a338a4cb042
Component: engine
 2015-12-30 11:19:15 -08:00
David Calavera
440e6d5df7 Merge pull request #18714 from jecarey/16756-docker_cli_pull_test 
Use of checkers in docker_cli_pull_test.go
Upstream-commit: 51fa287368205e1f043d632e5930b7cce08a2419
Component: engine
 2015-12-30 10:00:41 -08:00
David Calavera
fe3c5302af Merge pull request #18991 from qq690388648/master 
replace the os.Stdout with stdout to adapt platform
Upstream-commit: f962aac1ecd2d30f7ffafbfae7bcd4f14300b402
Component: engine
 2015-12-30 09:55:02 -08:00
Sebastiaan van Stijn
2821f3dd6b Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses 
fix incorrect ip addresses in networkingcontainers
Upstream-commit: 3b605b5926cff095452f2c2dca374bd132e23fac
Component: engine
 2015-12-30 17:49:08 +01:00
Jess Frazelle
f44591d6b9 Merge pull request #18987 from tianon/armhf 
Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets
Upstream-commit: 3be1a80f1ab2c07322cf54e4bce42914b797c3b1
Component: engine
 2015-12-30 08:21:52 -08:00
Arnaud Porterie
a51c7fe652 Merge pull request #18994 from thaJeztah/add-new-impact-labels 
add new impact/distribution label
Upstream-commit: 1dd4a2a966cb51b0797a07166a84aea7282ce99d
Component: engine
 2015-12-30 08:19:07 -08:00
David Calavera
eb2413b744 Merge pull request #18952 from coolljt0725/fix_stats_update 
Fix docker stats show wrong memory limit when do docker update
Upstream-commit: 708f98f5f9e0a8e957c689a15ca380b8e52f6269
Component: engine
 2015-12-30 08:17:42 -08:00
Sebastiaan van Stijn
149b5814a0 Merge pull request #18984 from coolljt0725/fix_daemon_start 
Fix daemon failed to start with error "layer does not exist"
Upstream-commit: 9860effc4e4a303aa12bdc8b0738003ddac1b121
Component: engine
 2015-12-30 16:52:41 +01:00
Mauricio Garavaglia
cfc051fa3a Fix files ownership when ADD is used 
Signed-off-by: Mauricio Garavaglia <mauriciogaravaglia@gmail.com>
Upstream-commit: b638bc6f17f7cef6534b20dd44845e5b066ae2cc
Component: engine
 2015-12-30 11:35:19 -03:00
Vincent Demeester
6c53da9054 Merge pull request #18985 from hqhq/hq_handle_dockerCmdInDir 
Handle error for dockerCmdInDir
Upstream-commit: c4486e48f2911ad6269c4746fb5a0ae4ea2c5e73
Component: engine
 2015-12-30 15:25:20 +01:00
Sebastiaan van Stijn
27b1292ae2 add new impact/distribution label 
Adds the new label to the documentation. The
impact/distribution label is intended for changes
that affect the image-format or interaction
with the registry (distribution).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ac0180620d906c39486963460415502f7abbd16f
Component: engine
 2015-12-30 13:53:46 +01:00
Sebastiaan van Stijn
69fc58a8aa Merge pull request #18925 from thaJeztah/please-dont-plus-one 
Be more explicit about "+1" comments
Upstream-commit: 024eead82f4739d028052b8138c3505d9e157a34
Component: engine
 2015-12-30 11:41:32 +01:00
qq690388648
20f675aab6 replace the os.Stdout with stdout to adapt platform 
Signed-off-by: Sun Gengze <690388648@qq.com>
Upstream-commit: 1cb9b0745c225433758397606a5ccd8404cb575e
Component: engine
 2015-12-30 18:24:02 +08:00
Tianon Gravi
6a60a41968 Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets 
Also, fix up some minor whitespace consistency issues, remove a little cruft, and update GOARM for armhf to 7 so that we're explicit.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: dc38061bee468ebfbfa3c89f0bb5b2edb5fd5147
Component: engine
 2015-12-30 01:30:56 -08:00
Qiang Huang
b167eafbb8 Handle error for dockerCmdInDir 
Only two of these are not handled, the one in `TestBuildForceRm`
is intended to not be handled, while the other one in
`TestBuildResourceConstraintsAreUsed` causes problem.

In test case `TestBuildResourceConstraintsAreUsed`, somehow we
are not able to access network to get base image, but the error
message is:

```
Error: failed to inspect container : Unable to read inspect data: json: cannot unmarshal array into Go value of type types.ContainerJSON
```

Totally confusion.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 1b34008532849467623039f78191e0f706fb34a5
Component: engine
 2015-12-30 15:21:34 +08:00
Lei Jitang
c64119dd87 Fix daemon failed to start with error "layer does not exist" 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 72d3d1ef856e2b3af78cccf463be5a9be823997b
Component: engine
 2015-12-30 14:19:31 +08:00
Lei Jitang
eee4baf0b5 Fix docker stats show wrong memory limit when do docker update 
When a container create with -m 100m and then docker update other
cgroup settings such as --cpu-quota, the memory limit show by
docker stats will become the default value but not the 100m.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 518ed75e1ab5b102fffd7fcbf046c127b44c7be7
Component: engine
 2015-12-29 20:33:16 -05:00
Qiang Huang
c8d08c88b3 Fix docs for memory-swap 
Fixes: #18894

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c68a483e442758733e800546545f1e016113d9cd
Component: engine
 2015-12-30 09:23:35 +08:00
David Calavera
51b37769f0 Remove usage of pkg sockets and tlsconfig. 
- Use the ones provided by docker/go-connections, they are a drop in replacement.
- Remove pkg/sockets from docker.
- Keep pkg/tlsconfig because libnetwork still needs it and there is a
  circular dependency issue.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 8e034802b7ad92a29f08785e553415adcd1348a3
Component: engine
 2015-12-29 19:27:12 -05:00
moxiegirl
069aa886a5 Merge pull request #18627 from londoncalling/cloud-installs 
[WIP] docs updates per issue 18282 cloud installs
Upstream-commit: de84dfba75a3055b8cad4eb8e6d9fd7bcecc30fc
Component: engine
 2015-12-29 14:54:18 -08:00
Sebastiaan van Stijn
0206b55252 Merge pull request #18978 from tswift242/fix-daemon-storage-doc-typo 
Fix typo in daemon storage-driver docs
Upstream-commit: 1614a8652034b4a52b8260187094a09296b7e879
Component: engine
 2015-12-29 23:33:05 +01:00
David Calavera
67d9ed19ac Merge pull request #18965 from duglin/FixError 
Fix error messages
Upstream-commit: acffc79fe43e7ffe7d97d427b6a339c6b1dc072a
Component: engine
 2015-12-29 14:12:22 -08:00
Thomas Swift
9d5c330d8f Fix typo in daemon storage-driver docs 
Signed-off-by: Thomas Swift <tgs242@gmail.com>
Upstream-commit: c44a8d8d8c9eccb79b16c874f083cd9597c3f6ca
Component: engine
 2015-12-29 17:06:02 -05:00
Jess Frazelle
80207e0951 Merge pull request #18974 from jfrazelle/remove-seccomp-from-seccomp-profile 
remove seccomp from seccomp profile
Upstream-commit: abc695d9d540610546e860ed5a9e432685b924b3
Component: engine
 2015-12-29 13:15:14 -08:00
Vincent Demeester
ddc1e7b5b5 Add authorization plugins to docker info 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a1eb3f3e275e2675a4c53852e21fddcaa301be9
Component: engine
 2015-12-29 22:10:23 +01:00
Arnaud Porterie
0aca5d35b3 Merge pull request #18877 from dnephin/move_graph_driver_to_layer_store 
Move graph driver to layer store
Upstream-commit: 7b540ee65358bce76575aa1370019444a86c99c1
Component: engine
 2015-12-29 12:19:02 -08:00
Arnaud Porterie
1149d92821 Merge pull request #18969 from justincormack/vm86 
Block vm86 syscalls in default seccomp profile
Upstream-commit: a81e438544500a121298c82f340db490efda8a86
Component: engine
 2015-12-29 11:57:35 -08:00
Arnaud Porterie
44a3b715ef Merge pull request #18972 from justincormack/bpf 
Block bpf syscall from default seccomp profile
Upstream-commit: 2307f47fdd2b3079cb623a69b0fa0a0ef502c624
Component: engine
 2015-12-29 11:57:07 -08:00
Arnaud Porterie
ed8f5303d0 Merge pull request #18971 from justincormack/ptrace 
Block additional ptrace related syscalls in default seccomp profile
Upstream-commit: e01cab1cc5c7f92747a479b5480ca78f7fc37101
Component: engine
 2015-12-29 11:56:51 -08:00
Arnaud Porterie
33e38a216c Merge pull request #18933 from coolljt0725/always_build 
Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
Upstream-commit: 3858027e27bb57457b641634afc8ffb1f3630884
Component: engine
 2015-12-29 11:53:06 -08:00
Jessica Frazelle
ba9125a4e7 remove seccomp from seccomp profile 
This can be allowed because it should only restrict more per the seccomp docs, and multiple apps use it today.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b610fc226afdf663b0ad46ad982c27fdee61f671
Component: engine
 2015-12-29 11:21:33 -08:00
Jess Frazelle
b5ac13e205 Merge pull request #18949 from jfrazelle/fix-libseccomp-version 
fix libseccomp where version < 2.2.1
Upstream-commit: 194e69507be4144d8a9ac72da524dcf46c3bb0e8
Component: engine
 2015-12-29 10:58:10 -08:00
Arnaud Porterie
9e1ed3e829 Merge pull request #18947 from jfrazelle/fix-seccomp-unsupported 
fix default profile where unsupported
Upstream-commit: 94e076086820aa34e6fc4fadb18714cd8b9263df
Component: engine
 2015-12-29 10:21:07 -08:00
Arnaud Porterie
0adeca917f Merge pull request #18953 from justincormack/robust_list 
Allow use of robust list syscalls in default seccomp policy
Upstream-commit: afdc4747dc16d4302ffd4f5dcb0fc537108862b7
Component: engine
 2015-12-29 10:19:41 -08:00
Arnaud Porterie
f88929edd0 Merge pull request #18956 from justincormack/umount 
Block original umount syscall in default seccomp filter
Upstream-commit: a32b06b067f847ee2cefe104430499c425c8fc2c
Component: engine
 2015-12-29 10:19:04 -08:00
Justin Cormack
c726c9026e Block additional ptrace related syscalls in default seccomp profile 
Block kcmp, procees_vm_readv, process_vm_writev.
All these require CAP_PTRACE, and are only used for ptrace related
actions, so are not useful as we block ptrace.

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
Upstream-commit: a0a8ca0ae0bc9dc7faa0b8bacf4ca376c7257348
Component: engine
 2015-12-29 18:17:28 +00:00
David Calavera
b2cbf3953e Merge pull request #18950 from zhanghuanzhong/docker-fix-pull-image-log-info 
Print the registry name while pulling an image
Upstream-commit: 3ec3597d58dd3c3d91465a03942e60c8e736a225
Component: engine
 2015-12-29 10:16:05 -08:00
Arnaud Porterie
42db75c945 Merge pull request #18959 from justincormack/finit_module 
Deny finit_module in default seccomp profile
Upstream-commit: ad8bce2ce4e27f7484fc65a3e6b9bf111793a263
Component: engine
 2015-12-29 10:12:50 -08:00
Arnaud Porterie
00259400b7 Merge pull request #18961 from justincormack/clock_adjtime 
Block clock_adjtime in default seccomp config
Upstream-commit: 8ac3d083a856729bc78adad3924e85d73d07173f
Component: engine
 2015-12-29 10:08:45 -08:00
Arnaud Porterie
d07f5e2095 Merge pull request #18968 from justincormack/stime 
Block stime in default seccomp profile
Upstream-commit: 294336a1af9d00c1a803c3318e092b1c1d0c5be9
Component: engine
 2015-12-29 10:07:40 -08:00
Justin Cormack
cb797e315a Block bpf syscall from default seccomp profile 
The bpf syscall can load code into the kernel which may
persist beyond container lifecycle. Requires CAP_SYS_ADMIN
already.

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
Upstream-commit: 33568405f34f363de49b1146119cc53bcb9e5f16
Component: engine
 2015-12-29 17:28:30 +00:00
Tianon Gravi
bc8b9546fd Merge pull request #18728 from hypriot/update-dockerfile-for-arm 
update Dockerfile.arm to reflect latest changes in main Dockerfile
Upstream-commit: 31bd242cba2eea84b3690e7b0f00864dd780a1af
Component: engine
 2015-12-29 09:24:29 -08:00
Jessica Frazelle
31e6f85fbe add note to packagers.md about libseccomp version 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 35667c3826d111babdeb35c7ab54609813fdb464
Component: engine
 2015-12-29 08:47:20 -08:00