89ca8a3104
Fix spelling of 'existent'
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: 899caaca9c990067d541231c6d288de89dbb79e7
Component: engine
2015-11-25 13:45:37 +00:00
0093235ece
Merge pull request #17924 from aaronlehmann/content-addressability
...
Content addressability
Upstream-commit: a2ab05098d1033f6b282ccaf7301f2a31eda1a9c
Component: engine
2015-11-24 11:01:33 -08:00
e105a29374
Update daemon and docker core to use new content addressable storage
...
Add distribution package for managing pulls and pushes. This is based on
the old code in the graph package, with major changes to work with the
new image/layer model.
Add v1 migration code.
Update registry, api/*, and daemon packages to use the reference
package's types where applicable.
Update daemon package to use image/layer/tag stores instead of the graph
package
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4352da7803d182a6013a5238ce20a7c749db979a
Component: engine
2015-11-24 09:40:25 -08:00
bea0c01ef1
Fix race in locker call to dec()
...
Can't safely use uint32 for locker since we need to decrement the count,
which requires loading the unit and doing some math, which is inherintly
racey.
Instead use Int32 which we can safely use with atomic and AddInt32 with
`-1`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 985175fd8f8f662d5067bd62a89330e9a437375c
Component: engine
2015-11-24 11:59:09 -05:00
f9f128d85f
Merge pull request #18146 from JamesKyburz/random-additions
...
Random additions
Upstream-commit: 692bfdaee3b48f4e5174bb80098692a0ded1aecf
Component: engine
2015-11-21 13:18:09 -05:00
9f0c131692
Merge pull request #16613 from WeiZhang555/docker-cp-symlink
...
Add option `-L` to allow `docker cp` follow symbol link
Upstream-commit: 3ff9bb53326312a66fee19bc56dd2ad9c642b133
Component: engine
2015-11-21 17:03:24 +01:00
d6089c6fe2
Add nauseous and pedantic
...
Signed-off-by: James Kyburz <james.kyburz@gmail.com >
Upstream-commit: f8a6726daddedd33c9e14db2133b0f5321c5ff5f
Component: engine
2015-11-21 16:23:07 +01:00
b97ed2a561
Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates
...
modifying docker --since and --until to support nanoseconds and time …
Upstream-commit: 6653f827965b431139af141fa2cc68a6513abe71
Component: engine
2015-11-20 23:37:44 +01:00
4599b4fbfc
Merge pull request #17456 from Microsoft/TestChtimesFix
...
Fix ChTimes to prevent setting times past the Unix Max Time
Upstream-commit: 6e727a4c8037d3ea43913ee23f34c9babaf420eb
Component: engine
2015-11-20 18:07:09 +01:00
27af07df7b
Add '-L' option for cp
...
Fixes #16555
Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 92600bdec1284f9031868751f61bef476d2e1dbd
Component: engine
2015-11-21 00:36:56 +08:00
e1191bf537
Merge pull request #17459 from brahmaroutu/Power_Z_CI
...
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
Upstream-commit: 249b3a9479048bcec8da0666c2e224dddcfc3de8
Component: engine
2015-11-19 15:50:07 -08:00
1d43e38301
Merge pull request #18082 from MHBauer/gh9406
...
Remove defaults for flags/options that expect no value
Upstream-commit: 9c21e852b2674a68d9b0fbbada368f5b7818b494
Component: engine
2015-11-19 15:06:21 -08:00
5fc4e385a6
This fixes Chtimes on systems with 32 bit Timespec
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 318ad1cb43bcf01f03d790ae258506121f30f117
Component: engine
2015-11-19 11:08:29 -08:00
c97969e0fa
Merge pull request #18090 from vdemeester/17478-follow-up-cleanup-pkg-platform
...
Follow-up of 17478, unexport runtimeArchitecture method
Upstream-commit: aade9536b6b64f6db385f38078b20bff846aec54
Component: engine
2015-11-19 14:00:23 -05:00
135336d608
Move charsToString to architecture dependent source to fix casting problem
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 7c1d49d90cbd91d7cc06d92686e2d09dd3dcac27
Component: engine
2015-11-19 18:09:08 +01:00
f51688acff
Remove defaults for flags/options that expect no value
...
- isZeroValue function from upstream go
- covers booleans, strings and numbers
- change integration to reflect new behavior
- resolves #9406
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 48718a3c772681b4a3644ba304d37fb9382e6f73
Component: engine
2015-11-19 08:37:51 -08:00
521256e49f
Follow-up of 17478, unexport private method
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0ff3c10aa8328c1f574ae6dd8caf5e20c3b97dfa
Component: engine
2015-11-19 14:55:57 +01:00
42a56c8bb4
Merge pull request #17986 from bogdangrigg/master
...
Fix small typos in documentation files
Upstream-commit: c83373112c908f7c5afc85fc6b08640817920a6d
Component: engine
2015-11-17 16:45:38 -08:00
7f6a96fa5d
Merge pull request #17434 from little-arhat/fix/newlines-in-json-status
...
Add newlines to FormatProgress for JSON as well
Upstream-commit: 53556183c7649480852d13d168a28dcfe92ac7f1
Component: engine
2015-11-17 15:52:31 -08:00
c4d89a3f60
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
Upstream-commit: 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe
Component: engine
2015-11-17 15:44:57 -08:00
eb219a3ce5
Use /usr/lib/os-release if /etc/os-release is missing.
...
As per os-release spec, /usr/lib/os-release file should be tried if
/etc/os-release is missing.
http://www.freedesktop.org/software/systemd/man/os-release.html
Thanks James Hunt <james.o.hunt@intel.com > and
Dimitri John Ledkov <dimitri.j.ledkov@intel.com > for contribution.
Close #17174
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 292a15e40a7201801fb9b0abd81175fd0a09a814
Component: engine
2015-11-16 16:21:31 -08:00
2052e6ad6a
Fix small typos in documentation files
...
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com >
Upstream-commit: d1e72baa15fb81a6dcf80e6727b884fc8ff67335
Component: engine
2015-11-15 00:53:27 +02:00
964f8b63bd
Add pkg/parsers/architecture and pkg/platform
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 49779b674af09b46c165c8dfe2e76054336b0595
Component: engine
2015-11-14 23:03:02 +01:00
a1e14407db
Merge pull request #17971 from narqo/simplify-addr-formating
...
Simplify final address formatting in parser.ParseTCPAddr
Upstream-commit: 1448cd3ec26ba98d4a0d53ff02a987ddab80939d
Component: engine
2015-11-14 08:38:09 +01:00
cf05bcf15c
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z.
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: b1cc78b8f5d0c85c80c04a15fa791025ae7d22e6
Component: engine
2015-11-14 03:16:45 +00:00
d91b38c0d5
Merge pull request #17877 from aaronlehmann/capped-bytespipe
...
Cap the amount of buffering done by BytesPipe
Upstream-commit: 13963957ebadc663915aed8c61451a93db41c27c
Component: engine
2015-11-14 00:51:11 +02:00
aac6b83468
Merge pull request #17090 from duglin/dockerignoreWildcards
...
Support multi-dir wildcards in .dockerignore
Upstream-commit: f5e318a17b8bd3126281add5e82dfb09be5b8f11
Component: engine
2015-11-13 14:29:34 -08:00
775e6c0f07
Support multi-dir wildcards in .dockerignore
...
Closes #13113
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eddb14a44eb3ca6ba0b5e6906e21d767eba1af86
Component: engine
2015-11-13 13:44:07 -08:00
1a8e0677b9
Merge pull request #17417 from cpuguy83/15815_add_log_file_poller
...
Fallback to file polling for jsonlog reader on err
Upstream-commit: 42fa8e31284c76f485bed81ed2e1327d60e5cb13
Component: engine
2015-11-13 11:49:54 -08:00
e6bfd3b818
Simplify address formating
...
Use `net.JoinHostPort()` which count IPv6 literals in `host`,
instead of relying on `net.ParseIP(host).To4()` side effects.
Signed-off-by: Vladimir Varankin <nek.narqo@gmail.com >
Upstream-commit: 38303597452719fe4942c45a03783a9299235e1b
Component: engine
2015-11-13 20:32:32 +03:00
0894666dd3
Merge pull request #17833 from rhatdan/signals
...
Define all of the signals defined by kill -l
Upstream-commit: 59a341ed2a875d3c46325f34abba59facc29f1f9
Component: engine
2015-11-13 09:03:51 -08:00
2f6a89e161
modifying docker --since and --until to support nanoseconds and time zones
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 430d8ff6113e41edc4605267081fa424a9bfe19f
Component: engine
2015-11-13 09:56:15 -06:00
c0d8796b26
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
cbcccc4a34
Merge pull request #17929 from mqliang/hardCode
...
Removing TODO in pkg/term/windows
Upstream-commit: b99b23ba93d5f9f9eda97c020274994173419c88
Component: engine
2015-11-12 19:56:09 +01:00
971f161db1
Cap the amount of buffering done by BytesPipe
...
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.
Adjust tests to work with the blocking Read and Write functions.
Remove BufReader, since now its users can use BytesPipe directly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 64f8ee444d23ae29a236f169f1d7faf7042b524a
Component: engine
2015-11-12 10:11:29 -08:00
b72fb39a59
Define all of the signals defined by kill -l
...
1) SIGHUP 2) SIGINT 3) SIGQUIT 4) SIGILL 5) SIGTRAP
6) SIGABRT 7) SIGBUS 8) SIGFPE 9) SIGKILL 10) SIGUSR1
11) SIGSEGV 12) SIGUSR2 13) SIGPIPE 14) SIGALRM 15) SIGTERM
16) SIGSTKFLT 17) SIGCHLD 18) SIGCONT 19) SIGSTOP 20) SIGTSTP
21) SIGTTIN 22) SIGTTOU 23) SIGURG 24) SIGXCPU 25) SIGXFSZ
26) SIGVTALRM 27) SIGPROF 28) SIGWINCH 29) SIGIO 30) SIGPWR
31) SIGSYS 34) SIGRTMIN 35) SIGRTMIN+1 36) SIGRTMIN+2 37) SIGRTMIN+3
38) SIGRTMIN+4 39) SIGRTMIN+5 40) SIGRTMIN+6 41) SIGRTMIN+7 42) SIGRTMIN+8
43) SIGRTMIN+9 44) SIGRTMIN+10 45) SIGRTMIN+11 46) SIGRTMIN+12 47) SIGRTMIN+13
48) SIGRTMIN+14 49) SIGRTMIN+15 50) SIGRTMAX-14 51) SIGRTMAX-13 52) SIGRTMAX-12
53) SIGRTMAX-11 54) SIGRTMAX-10 55) SIGRTMAX-9 56) SIGRTMAX-8 57) SIGRTMAX-7
58) SIGRTMAX-6 59) SIGRTMAX-5 60) SIGRTMAX-4 61) SIGRTMAX-3 62) SIGRTMAX-2
63) SIGRTMAX-1 64) SIGRTMAX
This will allow users to specify signals by name. Needed to make docker run --stop-signal
work as defined by systemd.
man systemd
defines the proper way to shutdown a systemd running as pid 1 in a container as
SIGRTMIN+4
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: d1ae13b0b06c109fb7c62bf86f3a9337bca630b5
Component: engine
2015-11-12 09:55:18 -05:00
c34deb74dc
kill TODO
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 644471bac85ca0d03645013767a5961504419d7c
Component: engine
2015-11-12 16:41:25 +08:00
14b70450aa
Merge pull request #17925 from cpuguy83/fix_locker_unit_tests
...
Use timeouts instead of relying on runtime.GoSched
Upstream-commit: 2337db8205f72b190f46a73dd28a25cee0f968f9
Component: engine
2015-11-11 18:46:52 -08:00
c0a993088d
Use timeouts instead of relying on runtime.GoSched
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: fd672d59269d100acbb36abef4e4eddc1d30bdc7
Component: engine
2015-11-11 20:59:07 -05:00
1a0735060a
Add support for blkio.weight_device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 0fbfa1449d917ee0778266139d6035fb0782f7c2
Component: engine
2015-11-11 23:06:36 +08:00
7a728fd261
Merge pull request #17732 from Microsoft/sjw/archive_access_time_fix
...
Fixing last access time on Windows to unblock python.
Upstream-commit: 35d9bcdb5778f04b76f781dc56e0668c9383b96c
Component: engine
2015-11-10 13:17:03 -08:00
d0affbc9f8
Merge pull request #17819 from tonistiigi/17766-fix-opq-dot
...
Fix opq whiteouts problems for files with dot prefix
Upstream-commit: 69bc4ebe7a7d05a07929cb2d63f27b4ccf87c905
Component: engine
2015-11-09 11:08:31 -08:00
4364a664e5
Merge pull request #17089 from Microsoft/10662-ansi
...
Windows: Native ANSI console support
Upstream-commit: 28588efb47bc22c409f14ea4a534a01c53c6e1bd
Component: engine
2015-11-09 08:05:08 -08:00
958ff17b48
Fix opq whiteouts problems for files with dot prefix
...
Fixes #17766
Previously, opaque directory whiteouts on non-native
graphdrivers depended on the file order, meaning
files added with the same layer before the whiteout
file `.wh..wh..opq` were also removed.
If that file happened to have subdirs, then calling
chtimes on those dirs after unpack would fail the pull.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: db3070ab1b9e394e45b1db22b8ed8352272d4410
Component: engine
2015-11-08 23:00:01 -08:00
aaf8bba9c2
Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store
...
Fix potential races in the volume store
Upstream-commit: cc207aa136fd5e01164d245de94fb900ca7212a2
Component: engine
2015-11-06 08:48:12 -08:00
f34b27bbfb
Fixing last access time on Windows to unblock python.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 37ba67bf636b34dc5c0c0265d62a089d0492088f
Component: engine
2015-11-05 12:15:18 -08:00
85d3458e13
Fix panic in parsing /etc/os-release
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7b102dc11486539bc661a4d858e2de3ce3f46493
Component: engine
2015-11-05 19:59:29 +01:00
66c6bac35d
Fallback to file polling for jsonlog reader on err
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c136a33c5bf233f4ce108a8a8481d78aeaec93cc
Component: engine
2015-11-05 10:05:05 -05:00
e3dc181362
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
Upstream-commit: 236913f4e825d747b091e8eda07b48f8d62a41a9
Component: engine
2015-11-05 00:50:08 +01:00
365046209e
Fix potential races in the volume store
...
Uses finer grained locking so that each volume name gets its own lock
rather than only being protected by the global lock, which itself needs
to be unlocked during cetain operations (`create` especially`)
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: fe66fdd18c0307cc02e6aeff8625c179452b8436
Component: engine
2015-11-04 16:59:47 -05:00
