0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31713 commits 14 branches 412 tags 338 MiB
Commit graph

31713 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wentao Zhang
4a014e6b0d Fix delete a image while saving it, delete successfully but failed to save it 
Issue Description:
 * 1. Saving more than one images, `docker save -o a.tar aaa bbb`
 * 2. Delete the last image which in saving progress.  `docker rmi bbb`

Espected:
 Saving images operation shouldn't be disturbed. But the real result is that failed to
save image and get an error as below:
  `Error response from daemon: open
/var/lib/docker/image/devicemapper/imagedb/content/sha256/7c24e4d533a76e801662ad1b7e6e06bc1204f80110b5623e96ba2877c51479a1:
no such file or directory`

Analysis:
  1. While saving more than one images, it will get all the image info from reference/imagestore,
     and then using the `cached data` to save the images to a tar file.
  2. But this process doesn't have a resource lock, if a deletion operation comes, the image will be deleted,
     so saving operation will fail.

Solution:
 When begin to save an image, `Get` all the layers first. then the
deletion operation won't delete the layers.

Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com>
 2017-06-01 18:13:20 +08:00
Victor Vieux
3dfce9fbb8 Merge pull request #31022 from jmzwcn/issue30994 
docker version output is not consistent when there are downgrades or incompatibilities #30994
 2017-03-31 15:55:03 -07:00
Victor Vieux
e45483964f Merge pull request #31800 from ripcurld0/checkpoint_ls 
Use formatter in docker checkpoint ls
 2017-03-31 15:54:22 -07:00
Kenfe-Mickaël Laventure
3d31198cda Merge pull request #31599 from ripcurld0/diff_cmd_format 
Use formatter in docker diff
 2017-03-31 11:19:41 -07:00
Vincent Demeester
d57825cb1e Merge pull request #31183 from thaJeztah/log-upgrade-rollback-error 
log error if restoring plugin fails
 2017-03-31 19:44:31 +02:00
Vincent Demeester
9f9cc221bd Merge pull request #31634 from AkihiroSuda/clarify-env-without-value 
api: clarify that Env var without `=` is removed from the environment
 2017-03-31 17:34:32 +02:00
Brian Goff
1325f667ee Merge pull request #27565 from rothrock/env-by-regex 
[splunk] Use a regex to match environment variables
 2017-03-31 10:46:48 -04:00
Sebastiaan van Stijn
5d25195f29
fix cleanup logic if restoring plugin fails 
The "err" output variable was masked by the "if" statement,
so the error was never updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-31 16:42:30 +02:00
Vincent Demeester
1ecaed0a99 Merge pull request #28696 from jlhawn/deprecate_graph_flag 
Deprecate --graph flag; Replace with --data-root
 2017-03-31 10:51:15 +02:00
Vincent Demeester
2a40b35629 Merge pull request #32246 from aboch/vnd 
Vendoring swarmkit @b74ec2b
 2017-03-31 10:33:57 +02:00
Sebastiaan van Stijn
05cd8bec32 Merge pull request #32236 from tonistiigi/fix-cmd-shell 
builder: Fix setting command with custom shell
 2017-03-31 03:26:28 +02:00
Alessandro Boch
4777fb6c6b Add ingress nw Test around consition which was panicing 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-30 16:12:48 -07:00
Alessandro Boch
747f0b4ba5 Vendoring swarmkit @b74ec2b 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-30 16:12:33 -07:00
Tonis Tiigi
a1fa59ea12 builder: Fix setting command with custom shell 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-30 13:29:21 -07:00
Sebastiaan van Stijn
9c0473fa65 Merge pull request #32222 from unclejack/small_cleanup 
Small cleanup
 2017-03-30 21:09:39 +02:00
Sebastiaan van Stijn
2ce39de0c8 Merge pull request #32010 from dongluochen/swarmkit_vendor 
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
 2017-03-30 17:24:33 +02:00
Evan Hazlett
59aed5ab36 Merge pull request #32174 from KarthikNayak/32113 
Dockerd: enable CORS when only `--api-cors-header` is used
 2017-03-30 11:13:52 -04:00
Vincent Demeester
ee61f28cc3 Merge pull request #32124 from vdemeester/system-inspect-secret 
Add support for `--type=secret` in `docker inspect`
 2017-03-30 17:01:57 +02:00
Brian Goff
c94e0f5d02 Merge pull request #32225 from thaJeztah/remove-flag-constant 
Remove constant for "config-file" flag
 2017-03-30 10:05:07 -04:00
unclejack
a23c456e5a pkg/*: clean up a few issues 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:50:46 +03:00
unclejack
90a44b875c pkg/urlutil: don't compare to bool 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:38:01 +03:00
unclejack
20d6f5c2a9 pkg/file{utils,notify}: don't compare to bool 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:38:01 +03:00
unclejack
087f7307a6 pkg/{chroot,}archive: clean up a few small issues 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:37:54 +03:00
Vincent Demeester
8305617510 Merge pull request #32213 from aaronlehmann/plugin-build-mac 
plugins: Rename plugins_linux.go to plugins_unix.go and use build tags
 2017-03-30 15:03:32 +02:00
Vincent Demeester
36c2f2731d Merge pull request #32199 from yuexiao-wang/add-examples 
provide `docker stack ps` examples
 2017-03-30 15:02:48 +02:00
yuexiao-wang
dcb4351d38 provide examples 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-03-31 05:11:36 +08:00
Sebastiaan van Stijn
df7a72cffa
Add conflict check for flags, and update deprecation versions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-30 12:21:05 +02:00
Sebastiaan van Stijn
9894576fb7
Remove constant for "config-file" flag 
None of the daemon flags use a constant for the
flag name.

This patch removes the constant for consistency

Also removes a FIXME, that was now in the wrong
location, and added a long time ago in
353b7c8ec7,
without a lot of context (and probably no longer really relevant).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-30 12:01:00 +02:00
Sebastiaan van Stijn
11c2056204 Merge pull request #32221 from harche/patch-2 
Fixing a typo in spelling
 2017-03-30 11:33:06 +02:00
Josh Hawn
261ef1fa27 Deprecate --graph flag; Replace with --data-root 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2017-03-30 11:24:56 +02:00
harche
5e1349e083 Fixing a typo in spelling 
Wrong tense used in a sentence

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2017-03-30 14:31:45 +05:30
Vincent Demeester
b214d8d893 Merge pull request #32209 from aboch/vnd 
Vendoring vishvananda/netlink @c682914
 2017-03-30 09:56:02 +02:00
Boaz Shuster
3dad39b957 Use formatter in docker diff 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-30 10:33:40 +03:00
Lei Jitang
f459e3af9e Merge pull request #32197 from FengtuWang/fix_TestDaemonRestartWithInvalidBasesize 
fix TestDaemonRestartWithInvalidBasesize
 2017-03-30 10:15:48 +08:00
Sebastiaan van Stijn
f16d1a47cc Merge pull request #31741 from mlaventure/cleanup-tmp-on-start 
Cleanup docker tmp dir on start
 2017-03-30 03:14:55 +02:00
Sebastiaan van Stijn
165a5c6934 Merge pull request #32013 from albers/completion-secret-ls--format 
Add bash completion for `secret ls --format`
 2017-03-30 03:09:02 +02:00
Aaron Lehmann
85357a1167 Make pkg/devicemapper and pkg/loopback depend on cgo in build tags 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-29 17:55:42 -07:00
Tibor Vass
5ec88474b7 Merge pull request #32215 from tiborvass/docs-yaml-fix-makefile 
docs: fix Makefile for yaml docs generation
 2017-03-29 16:38:11 -07:00
Aaron Lehmann
8eb7edab7c Add line to hack/make/cross to cross-compile pkgs directory 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-29 15:58:03 -07:00
Tibor Vass
36bd288162 docs: fix Makefile for yaml docs generation 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-03-29 15:07:16 -07:00
Aaron Lehmann
3da1192828 plugins: Rename plugins_linux.go to plugins_unix.go and use build tags 
This allows pkg/authorization to build on OS X.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-29 14:06:59 -07:00
Aaron Lehmann
278b36e5ce Merge pull request #32200 from yuexiao-wang/update-usage 
fix inconsistency for docker service ps
 2017-03-29 13:58:14 -07:00
yuexiao-wang
6d50737355 fix inconsistency for 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-03-30 05:42:18 +08:00
Harald Albers
31a8965dd4 Add bash completion for secret ls --format 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-29 13:54:38 -07:00
Sebastiaan van Stijn
bbae982ac8 Merge pull request #32211 from vieux/stretch_without_lsb 
install: map debian_version 9.X to debian stretch without lsb_release
 2017-03-29 20:56:45 +02:00
Victor Vieux
8d0de1fa8d Merge pull request #32204 from thaJeztah/remove-generated-changelog 
delete generated rpm "changelog"
 2017-03-29 11:47:20 -07:00
Victor Vieux
f8360d002d install: map debian_version 9.X to debian stretch without lsb_release 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-29 11:36:34 -07:00
Alessandro Boch
694c787123 Vendoring vishvananda/netlink @c682914 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-29 10:58:02 -07:00
Sebastiaan van Stijn
089b71443a
delete generated rpm "changelog" 
The generated "changelog" was not removed
before re-generating, causing the changelog
to be added twice on repeated runs of "make rpm"
(when bind-mounting the local source).

As a result, rpms failed to build, because
the resulting file had entries in non-chronological
order.

This change removes the generated file
before re-generating, and adds the file
to .gitignore, to prevent it from
accidentally being added to source control.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-29 18:19:07 +02:00
Daniel Zhang
50aa1e5b28 Docker version output is not consistent when there are downgrades or incompatibilities. 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
 2017-03-29 21:53:19 +08:00