35638190ef
Merge pull request #16054 from jfrazelle/update-sqlite3-dep
...
code.google.com is shutting down so update the dep
Upstream-commit: 38ecc7fc32ba2acdb95559292d4a7aed5b1cbabe
Component: engine
2015-09-03 19:20:57 -07:00
4d787283f5
Merge pull request #16066 from jfrazelle/remove-reprepro
...
remove reprepro
Upstream-commit: 90477e8e94b45a52ed8c1a10c48827cef6fc8bdc
Component: engine
2015-09-03 18:20:01 -07:00
6dccafea52
Merge pull request #15706 from clnperez/vendor-helper-use-branch
...
Allow branch name in vendor-helper script
Upstream-commit: 1fa560e6eb73ca55b7e5f9e4227ab5dd4ce310ee
Component: engine
2015-09-03 18:02:06 -07:00
8f7f593e20
Merge pull request #16052 from jfrazelle/fix-release-selinux
...
make docker-engine-selinux findable
Upstream-commit: b01922999626fcafb789eb61957bceaef1f5cdf4
Component: engine
2015-09-03 17:52:39 -07:00
e579f48cbf
Merge pull request #15845 from calavera/refactor_daemon_list
...
Refactor daemon container list.
Upstream-commit: c8c1c472b21fbe7079f5fccbbda8d9652c7c00d3
Component: engine
2015-09-03 20:48:54 -04:00
c7a363d08b
Merge pull request #15846 from ZJU-SEL/11646-fix-path-validations
...
fix 11646 to check volume path in server side
Upstream-commit: 057f53f503d21e004ec4f75eeafa10de1ceecc63
Component: engine
2015-09-03 20:42:37 -04:00
4de5cdb2f1
code.google.com is shutting down so update the dep
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 4a864a755240709612f564f64839604a0697e11f
Component: engine
2015-09-03 17:39:29 -07:00
eeddb0adf8
remove reprepro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: e7cf75c103fe8c21af18f6e1afbccb1c21101081
Component: engine
2015-09-03 17:31:49 -07:00
7db3a64e57
Merge pull request #16060 from vdemeester/14756-lint-pkg-term-windows
...
Lint pkg/term/windows package
Upstream-commit: 07d2eae6d57ecdac82fa41ad342b6bb21d537848
Component: engine
2015-09-03 19:54:20 -04:00
b5219c6311
Merge pull request #16041 from runcom/portmapping-doc-cleaning
...
Clean latest api doc from PortMapping and outdated error check
Upstream-commit: 2d605ce53bc45f6d83f3d1c873d57d207d84b7d4
Component: engine
2015-09-03 19:37:34 -04:00
3c8280bd5b
Merge pull request #16067 from jfrazelle/fix-release-branch-in-suites-script
...
fix release branch in suites.sh
Upstream-commit: 9b072fb722e67006c42f8d61ee377ee140e325d6
Component: engine
2015-09-03 16:33:32 -07:00
3aa213ceb8
fix release branch in suites.sh
...
we changed the naming scheme of the release branch
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: e38a9ecef6849304b6d961b24af16fbd1f4912d6
Component: engine
2015-09-03 15:48:02 -07:00
1e6fd6c910
Merge pull request #16027 from Microsoft/10662-utimes
...
Windows: Fix dockerfile ADD from HTTP
Upstream-commit: 6ffbea3c94ea4b3f6177dff3e7dc40e4c67dc9f4
Component: engine
2015-09-03 18:44:34 -04:00
32bca980ee
Merge pull request #16022 from nalind/cgo-windows
...
Fix a daemon build error when cgo isn't available
Upstream-commit: f0a5d03400429c6e97efacdb50d175c3fd85ba63
Component: engine
2015-09-03 18:42:58 -04:00
ff114b4d32
Lint pkg/term/windows package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3409de971c7bd3c84c324d19f422fcb3c6777f02
Component: engine
2015-09-03 22:25:52 +02:00
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
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
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
2f2b355be9
Merge pull request #16038 from aboch/sbx
...
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
Upstream-commit: 288275ab60c049fa644f1ce5d36c0c005e8dd02c
Component: engine
2015-09-03 11:48:02 -07:00
afcc143845
make docker-engine-selinux findable
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c7b3e7e7701a30ad0eb3f58d9b0cf3149cc82fda
Component: engine
2015-09-03 08:58:33 -07:00
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
3b4e85f885
Clean latest api doc from PortMapping and outdated error check
...
Regarding the outdated error check, there's no `docker.PortMapping`
struct anymore and this is linked to something really old #1334
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 137c12f19a6838eeebfd45c459b883bb69f53d36
Component: engine
2015-09-03 11:01:55 +02:00
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
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
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
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
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
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
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
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
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
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
c4fcb79000
Windows: Fix dockerfile ADD from HTTP
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3715e60c71abbcc794a9ec9f95e06d7a5ae5ee30
Component: engine
2015-09-02 13:53:09 -07:00
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
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
87f00c9aac
Fix a daemon build error when cgo isn't available
...
Avoid duplicate definitions of NewSqliteConn when cgo isn't enabled, so
that we can at least build the daemon.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com > (github: nalind)
Upstream-commit: 00ab6d9d471ccaa4a66395e747eadb6eeb5dd3f5
Component: engine
2015-09-02 11:41:42 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jessie Frazelle
Tianon Gravi
Tibor Vass
Jessica Frazelle
Vincent Demeester
Brian Goff
Michael Crosby
David Calavera
Antonio Murdaca
Sebastiaan van Stijn
Alexander Morozov
Alessandro Boch
John Howard
Sally O'Malley
Aaron Lehmann
Nalin Dahyabhai
Suryakumar Sudar
Antonio Murdaca
angt
Todd Crane
Stephen Rust