Vincent Batts
90b9ae3169
save: integration test for timestamp matching
...
The `docker save`ed output ought to have matching timestamp to the layer
creation.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: e4478caddf78700bd42f94eb382ae1805a443618
Component: engine
2015-10-01 14:38:55 -04:00
Vincent Batts
37cabec013
graph: exported images times matching creation
...
the image export, that is used in `docker save` previous has just had
the layers times (atimes, mtimes) be when the save was done.
```bash
vbatts@valse ~ (master) $ docker save busybox | tar tv
drwxr-xr-x 0/0 0 2015-09-03 22:22 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/
-rw-r--r-- 0/0 3 2015-09-03 22:22 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/VERSION
-rw-r--r-- 0/0 1405 2015-09-03 22:22 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/json
-rw-r--r-- 0/0 2643968 2015-09-03 22:22 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/layer.tar
drwxr-xr-x 0/0 0 2015-09-03 22:22 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/
-rw-r--r-- 0/0 3 2015-09-03 22:22 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/VERSION
-rw-r--r-- 0/0 1346 2015-09-03 22:22 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/json
-rw-r--r-- 0/0 1024 2015-09-03 22:22 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/layer.tar
drwxr-xr-x 0/0 0 2015-09-03 22:22 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/
-rw-r--r-- 0/0 3 2015-09-03 22:22 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/VERSION
-rw-r--r-- 0/0 1181 2015-09-03 22:22 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/json
-rw-r--r-- 0/0 1024 2015-09-03 22:22 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/layer.tar
-rw-r--r-- 0/0 90 2015-09-03 22:22 repositories
```
With this change, the layer's directory and artifact will have times
matching the image layer's created time. The "repositories" file is set
to epoch.
```bash
vbatts@valse ~ (master) $ docker save busybox | tar tv
drwxr-xr-x 0/0 0 2015-04-17 18:01 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/
-rw-r--r-- 0/0 3 2015-04-17 18:01 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/VERSION
-rw-r--r-- 0/0 1405 2015-04-17 18:01 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/json
-rw-r--r-- 0/0 2643968 2015-04-17 18:01 6ce2e90b0bc7224de3db1f0d646fe8e2c4dd37f1793928287f6074bc451a57ea/layer.tar
drwxr-xr-x 0/0 0 2015-04-17 18:01 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/
-rw-r--r-- 0/0 3 2015-04-17 18:01 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/VERSION
-rw-r--r-- 0/0 1346 2015-04-17 18:01 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/json
-rw-r--r-- 0/0 1024 2015-04-17 18:01 8c2e06607696bd4afb3d03b687e361cc43cf8ec1a4a725bc96e39f05ba97dd55/layer.tar
drwxr-xr-x 0/0 0 2015-04-17 18:01 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/
-rw-r--r-- 0/0 3 2015-04-17 18:01 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/VERSION
-rw-r--r-- 0/0 1181 2015-04-17 18:01 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/json
-rw-r--r-- 0/0 1024 2015-04-17 18:01 cf2616975b4a3cba083ca99bc3f0bf25f5f528c3c52be1596b30f60b0b1c37ff/layer.tar
-rw-r--r-- 0/0 90 1969-12-31 19:00 repositories
```
Side effect of this is that the tar stream from `docker save` is now
more deterministic.
```bash
vbatts@valse ~ (master) $ docker save busybox | sha1sum
baf03e30ef79ca4d9c5e512d3a1b873880f404ca -
vbatts@valse ~ (master) $ docker save busybox | sha1sum
baf03e30ef79ca4d9c5e512d3a1b873880f404ca -
vbatts@valse ~ (master) $ docker save busybox | sha1sum
baf03e30ef79ca4d9c5e512d3a1b873880f404ca -
vbatts@valse ~ (master) $ docker save busybox | sha1sum
baf03e30ef79ca4d9c5e512d3a1b873880f404ca -
```
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7795b1c6979c1da3f05e995e15a966c969d6895f
Component: engine
2015-09-03 22:19:10 -04:00
Brian Goff
140037e825
Merge pull request #16025 from sallyom/overlayfsSelinux
...
selinux/overlay incompatible err
Upstream-commit: 9d0eef55eabeb36ae1f182ed954411f00275f96e
Component: engine
2015-09-03 16:08:55 -04:00
Michael Crosby
8ebc68df59
Merge pull request #16018 from surya-shodan/master
...
Typo in README.md
Upstream-commit: 6f5eb78519442bc26680e8e5406bbd788a395815
Component: engine
2015-09-03 11:57:06 -07:00
Michael Crosby
f8d3e36feb
Merge pull request #16036 from Microsoft/10662-httpdirectory
...
Windows: Fix HTTP download directory
Upstream-commit: 8258996cf28a2e25c6c765b48acf9ad889996827
Component: engine
2015-09-03 11:54:53 -07:00
Michael Crosby
2f2b355be9
Merge pull request #16038 from aboch/sbx
...
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
Upstream-commit: 288275ab60c049fa644f1ce5d36c0c005e8dd02c
Component: engine
2015-09-03 11:48:02 -07:00
David Calavera
bc3067e74f
Merge pull request #16001 from jfrazelle/apt-repo-pinning
...
use apt-ftparchive and reprepro to enable apt-pinning;
Upstream-commit: d9065fcdb5f2cd1bd020e04a43e45f13530da2a6
Component: engine
2015-09-03 11:18:54 +02:00
Sebastiaan van Stijn
34cffe24d5
Merge pull request #15984 from jlhawn/document_build_auth_config
...
[docs] Add description of "X-Registry-Config"
Upstream-commit: ee4de4d16342787335047528e6459411fedcfcc0
Component: engine
2015-09-03 08:40:34 +02:00
Alexander Morozov
6d827cad48
Merge pull request #16035 from aaronlehmann/remove-test-push-interrupt
...
Remove TestPushInterrupt
Upstream-commit: 2bd30cd6cb1fa3c7de5001a28a49057da743dafe
Component: engine
2015-09-02 21:07:55 -07:00
Alessandro Boch
357660a251
Docker changes for libnetwork Sandbox
...
- Ground-work for integrating with user namespace support
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 56fdb05258d1ab2153fec268ed22cf9d1227c356
Component: engine
2015-09-02 17:24:56 -07:00
Brian Goff
4da3ed2f74
Merge pull request #16030 from Microsoft/fix-golint-commit
...
Windows: Fix golint daemon breaking commit
Upstream-commit: fb4cce5e53061d8a0f4bd228e1a0286ccace0d8e
Component: engine
2015-09-02 20:10:33 -04:00
Alessandro Boch
2a15577401
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
...
Main changes in this vendoring are to allow user name space integration in docker.
And it includes major fix for network namespace handling
Signed-off-by: Alessandro Boch <aboch@docker.com >
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 414dfbf681d956c11c83d9b7598962a1294f2c5d
Component: engine
2015-09-02 16:57:43 -07:00
John Howard
c264fc5ef8
Windows: Fix HTTP download directory
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7beb026f0e981df484363ae017d43c8167c80a6e
Component: engine
2015-09-02 16:24:53 -07:00
Jessie Frazelle
bcf9624e7a
Merge pull request #16002 from Microsoft/10662-workdir-platformsemantics
...
Windows: Ensure workdir handled in platform semantics
Upstream-commit: c6dd4510736dbbf3166b1eb7715b51fb15ca1678
Component: engine
2015-09-02 16:09:35 -07:00
Sally O'Malley
8925b7fcf4
selinux/overlay incompatible err
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 04329e0b3e47e411ebf0a4ba8947be6e87014737
Component: engine
2015-09-02 18:52:10 -04:00
Aaron Lehmann
9980495b3c
Remove TestPushInterrupt
...
This test relies on a race condition, and has been failing often in CI.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 6cc38775bbff9b9304e551b26593af9c867c61bb
Component: engine
2015-09-02 15:30:55 -07:00
John Howard
851cbff030
Windows: Fix golint daemon breaking commit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cfddca2bf90764757a436720361cda674071ba4f
Component: engine
2015-09-02 14:36:45 -07:00
Jessie Frazelle
e62c5d4ded
Merge pull request #15935 from vdemeester/badges-all-the-things
...
Add more badges :)
Upstream-commit: 2434bd8e63daebffa69ca863ab8a322847f459c8
Component: engine
2015-09-02 11:07:25 -07:00
Jessica Frazelle
5fbd39445a
use apt-ftparchive and reprepro to enable apt-pinning;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 12a71c8954cb51985243cb1afc2841cf7f4ce0a2
Component: engine
2015-09-02 09:32:24 -07:00
Antonio Murdaca
262b85d1ce
Remove PortMapping from container NetworkSettings
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: db4f20404d2b8c4da5a15e447f52cd634445cfe3
Component: engine
2015-09-02 14:32:53 +02:00
Suryakumar Sudar
d70ac4dbbe
Typo in README.md
...
The number of StackOverflow question is 7000, not 7000k. The extra 'k' is redundant.
Signed-off-by: Suryakumar Sudar <suryakumar.sudar@gmail.com >
Upstream-commit: dae50f9b5e7861e0cc055f2070fa86b409d80e64
Component: engine
2015-09-02 15:52:05 +05:30
Antonio Murdaca
4c16768ce6
Merge pull request #16014 from angt/angt-patch-2
...
Fix typo
Upstream-commit: 9ea72672856fe5777f12d6939a2e0c7fca9f5550
Component: engine
2015-09-02 11:25:12 +02:00
David Calavera
49cb61bb67
Merge pull request #15921 from srust/volume_driver_register_retry
...
Retry registering a volume driver
Upstream-commit: 1ed3cb2b6c47d7e3d83882181346f0b9708f3e2c
Component: engine
2015-09-02 11:24:52 +02:00
angt
68cefd3677
Fix typo
...
Signed-off-by: Adrien Gallouët <agallouet@gmail.com >
Upstream-commit: 01059cba78be1796c2152dea53d7f0461aaba1da
Component: engine
2015-09-02 10:43:49 +02:00
Todd Crane
16c77243f1
Normalized, ungrouped, and sorted names
...
Signed-off-by: Todd Crane <todd@toddcrane.com >
Upstream-commit: ed14fe2afa77120d07676f30ff61db93ecd38ec9
Component: engine
2015-09-01 21:57:01 -07:00
John Howard
d965c25392
Windows: Ensure workdir handled in platform semantics
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6c56f917d3facec1438d03712f8a26d929fbe5ea
Component: engine
2015-09-01 18:50:41 -07:00
Jessie Frazelle
09cd6b521c
Merge pull request #15989 from tianon/ubuntu
...
Swap "ubuntu-debootstrap" for just "ubuntu"
Upstream-commit: 7f8954cb79c3126f1c099e260f6b420946dcba23
Component: engine
2015-09-01 15:19:16 -07:00
Alexander Morozov
ab638f4a30
Merge pull request #15988 from runcom/use-stringutils-strslice
...
Use StrSlice from pkg/stringutils
Upstream-commit: 3111aa7293f49f550b56652c622b0f4d194aae6f
Component: engine
2015-09-01 14:32:58 -07:00
Tianon Gravi
0e20c40e36
Swap "ubuntu-debootstrap" for just "ubuntu"
...
See https://github.com/docker-library/official-images/pull/982#issuecomment-133207587 .
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: a5eec723f8509c8fe588e3a57d14d6c9df6aa87b
Component: engine
2015-09-01 14:03:49 -07:00
Alexander Morozov
155cdd5cef
Merge pull request #15986 from runcom/add-strslice-tests
...
pkg: stringutils: Add more tests to strslice
Upstream-commit: 7c4420903782bff692ba3c8a0236f836a9865bfd
Component: engine
2015-09-01 12:29:27 -07:00
Antonio Murdaca
b67d02c383
Use StrSlice from pkg/stringutils
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 17999c70c39e14a474e69ce10de05a66258e2a5b
Component: engine
2015-09-01 21:23:46 +02:00
Stephen Rust
3ce116129d
Retry registering a volume driver
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
Upstream-commit: 45fdce8a0d36d9b0825a6dfb6634a81f9af258af
Component: engine
2015-09-01 14:56:29 -04:00
Antonio Murdaca
98ff0ef802
pkg: stringutils: Add more tests to strslice
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: cac8f4f0d057dd89fd2ef16e3a58e96d2fee2e70
Component: engine
2015-09-01 20:27:45 +02:00
Alexander Morozov
6bbc3d3c6c
Merge pull request #15983 from Microsoft/unix-run-test
...
Move run tests out of unix files
Upstream-commit: 70f0d6d84c77a3c425d2d6e790730b5abe2abcca
Component: engine
2015-09-01 10:49:01 -07:00
Josh Hawn
186d7f8a00
[docs] Add description of "X-Registry-Config"
...
The structure of this header has never been specified in the docs and has
been a pain point for those who have tried to get registry authentication
to work during builds. This Patch *finally* adds a description of JSON
object which should be base64-url-safe-encoded and used as the value of
the X-Registry-Config HTTP request header during `POST /build`.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 61de9629799094d579068899ca407d5034183e0f
Component: engine
2015-09-01 10:05:30 -07:00
Alexander Morozov
746e1febcc
Merge pull request #15980 from Microsoft/unix-links-test
...
Moved unix links tests to non-platform
Upstream-commit: 82415adc81df05d616c83c949d8d398a0d4ff3ed
Component: engine
2015-09-01 10:03:54 -07:00
John Howard
e3bcc2a340
Move run tests out of unix files
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d7eb85bb1f0076ccffbec7c9291cc27d2cc4cc03
Component: engine
2015-09-01 09:42:19 -07:00
David Calavera
d5f4fa7913
Merge pull request #15871 from Microsoft/10662-absolute
...
Windows: Fix absolute checks
Upstream-commit: 2093616d7f4d74fbdd1a48cfc0fa8219840b2d41
Component: engine
2015-09-01 18:38:36 +02:00
Alexander Morozov
42b66ecf1d
Merge pull request #15972 from calavera/remove_containers_ps
...
Remove /containers/ps from the api router.
Upstream-commit: 7f58fb5f014b723073bcea7598ee8ecac9fb2edd
Component: engine
2015-09-01 09:15:35 -07:00
John Howard
4dabd24bfd
Moved unix links tests to non-platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4fccf8adfa50855afa0ffaed1ea5c22ddaa7b2e4
Component: engine
2015-09-01 09:10:24 -07:00
Alexander Morozov
852f919527
Merge pull request #15834 from Microsoft/10662-fixdockercp
...
Windows: Fix docker cp
Upstream-commit: be8e126a0f301c3bebf01e50349632670c9ab938
Component: engine
2015-09-01 08:41:59 -07:00
John Howard
49e7160994
Windows: Fix absolute checks
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 49c1b51ae22e54edc2e13f3195583e47b987fc15
Component: engine
2015-09-01 08:41:37 -07:00
David Calavera
c770771c57
Merge pull request #15976 from duglin/MissingDefer
...
Add missing defer to delete temp dir
Upstream-commit: 26fb160610dc5195ef8d84f972a3fc215541a1b3
Component: engine
2015-09-01 17:13:37 +02:00
Antonio Murdaca
c60fcca7ee
Merge pull request #15913 from mountkin/abstract
...
abstract the string slice struct to stringutils package
Upstream-commit: 4bb2449188a7d09de5fd35d1be4b35dd5780c825
Component: engine
2015-09-01 17:06:13 +02:00
Doug Davis
9783af1dd1
Add missing defer to delete temp dir
...
Minor thing I just noticed
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 51e721ab072441ba6ae14b84613cf2b3acd6316b
Component: engine
2015-09-01 07:19:38 -07:00
Brian Goff
7d0cd077a1
Merge pull request #15965 from tonistiigi/pull-goroutine-leak
...
Fix goroutine leak on pull
Upstream-commit: 3b2c9fa049f9fd17936f6188d983fd70df00d746
Component: engine
2015-09-01 09:27:55 -04:00
Brian Goff
81b8a83415
Merge pull request #15900 from Microsoft/10662-testinfra
...
Test infrastructure for cross platform
Upstream-commit: 567687fd98d471a3b4a04ba0aa3a595c931799ef
Component: engine
2015-09-01 09:18:29 -04:00
Doug Davis
1f4c9f858c
Merge pull request #15927 from SvenDowideit/clean-up-parsehost
...
Change ParseTCPAddr to use tcp://127.0.0.0:2375 format as default consistently
Upstream-commit: 5eb4a6b93357d73fa0ec9c952114c0d225be8524
Component: engine
2015-09-01 08:25:59 -04:00
Antonio Murdaca
7f33443dc2
Merge pull request #15970 from Mashimiao/cleanup-daemon-commit-unneeded-code
...
daemon/commit: remove unneeded code
Upstream-commit: e98ec2b5675610146f1c6c918f6b1665692d3bca
Component: engine
2015-09-01 14:15:56 +02:00
David Calavera
7db6f3531c
Merge pull request #15958 from vdemeester/14570-contrib-completion-image
...
Add docker ps --filter=… ancestor image bash completion
Upstream-commit: dd4900205563e2f0d3fa01c43ceb27654aeb9ec8
Component: engine
2015-09-01 12:16:52 +02:00