Alexander Morozov
0009852cb0
Merge pull request #15877 from Microsoft/10662-trigger
...
Fix trigger count and output
2015-09-03 20:04:05 -07:00
Jessie Frazelle
38ecc7fc32
Merge pull request #16054 from jfrazelle/update-sqlite3-dep
...
code.google.com is shutting down so update the dep
2015-09-03 19:20:57 -07:00
Jessie Frazelle
90477e8e94
Merge pull request #16066 from jfrazelle/remove-reprepro
...
remove reprepro
2015-09-03 18:20:01 -07:00
Jessie Frazelle
1fa560e6eb
Merge pull request #15706 from clnperez/vendor-helper-use-branch
...
Allow branch name in vendor-helper script
2015-09-03 18:02:06 -07:00
Tianon Gravi
b019229996
Merge pull request #16052 from jfrazelle/fix-release-selinux
...
make docker-engine-selinux findable
2015-09-03 17:52:39 -07:00
Tibor Vass
c8c1c472b2
Merge pull request #15845 from calavera/refactor_daemon_list
...
Refactor daemon container list.
2015-09-03 20:48:54 -04:00
Tibor Vass
057f53f503
Merge pull request #15846 from ZJU-SEL/11646-fix-path-validations
...
fix 11646 to check volume path in server side
2015-09-03 20:42:37 -04:00
Jessica Frazelle
4a864a7552
code.google.com is shutting down so update the dep
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-03 17:39:29 -07:00
John Howard
6620102926
Fix trigger count and output
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-03 17:39:19 -07:00
Jessica Frazelle
e7cf75c103
remove reprepro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-03 17:31:49 -07:00
Tibor Vass
07d2eae6d5
Merge pull request #16060 from vdemeester/14756-lint-pkg-term-windows
...
Lint pkg/term/windows package
2015-09-03 19:54:20 -04:00
Tibor Vass
2d605ce53b
Merge pull request #16041 from runcom/portmapping-doc-cleaning
...
Clean latest api doc from PortMapping and outdated error check
2015-09-03 19:37:34 -04:00
Jessie Frazelle
9b072fb722
Merge pull request #16067 from jfrazelle/fix-release-branch-in-suites-script
...
fix release branch in suites.sh
2015-09-03 16:33:32 -07:00
Jessica Frazelle
e38a9ecef6
fix release branch in suites.sh
...
we changed the naming scheme of the release branch
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-03 15:48:02 -07:00
Tibor Vass
6ffbea3c94
Merge pull request #16027 from Microsoft/10662-utimes
...
Windows: Fix dockerfile ADD from HTTP
2015-09-03 18:44:34 -04:00
Tibor Vass
f0a5d03400
Merge pull request #16022 from nalind/cgo-windows
...
Fix a daemon build error when cgo isn't available
2015-09-03 18:42:58 -04:00
Vincent Demeester
3409de971c
Lint pkg/term/windows package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-03 22:25:52 +02:00
Brian Goff
9d0eef55ea
Merge pull request #16025 from sallyom/overlayfsSelinux
...
selinux/overlay incompatible err
2015-09-03 16:08:55 -04:00
Michael Crosby
6f5eb78519
Merge pull request #16018 from surya-shodan/master
...
Typo in README.md
2015-09-03 11:57:06 -07:00
Michael Crosby
8258996cf2
Merge pull request #16036 from Microsoft/10662-httpdirectory
...
Windows: Fix HTTP download directory
2015-09-03 11:54:53 -07:00
Michael Crosby
288275ab60
Merge pull request #16038 from aboch/sbx
...
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
2015-09-03 11:48:02 -07:00
Jessica Frazelle
c7b3e7e770
make docker-engine-selinux findable
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-03 08:58:33 -07:00
David Calavera
d9065fcdb5
Merge pull request #16001 from jfrazelle/apt-repo-pinning
...
use apt-ftparchive and reprepro to enable apt-pinning;
2015-09-03 11:18:54 +02:00
Antonio Murdaca
137c12f19a
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>
2015-09-03 11:01:55 +02:00
Sebastiaan van Stijn
ee4de4d163
Merge pull request #15984 from jlhawn/document_build_auth_config
...
[docs] Add description of "X-Registry-Config"
2015-09-03 08:40:34 +02:00
Alexander Morozov
2bd30cd6cb
Merge pull request #16035 from aaronlehmann/remove-test-push-interrupt
...
Remove TestPushInterrupt
2015-09-02 21:07:55 -07:00
Alessandro Boch
56fdb05258
Docker changes for libnetwork Sandbox
...
- Ground-work for integrating with user namespace support
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-02 17:24:56 -07:00
Brian Goff
fb4cce5e53
Merge pull request #16030 from Microsoft/fix-golint-commit
...
Windows: Fix golint daemon breaking commit
2015-09-02 20:10:33 -04:00
Alessandro Boch
414dfbf681
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>
2015-09-02 16:57:43 -07:00
John Howard
7beb026f0e
Windows: Fix HTTP download directory
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-02 16:24:53 -07:00
Jessie Frazelle
c6dd451073
Merge pull request #16002 from Microsoft/10662-workdir-platformsemantics
...
Windows: Ensure workdir handled in platform semantics
2015-09-02 16:09:35 -07:00
Sally O'Malley
04329e0b3e
selinux/overlay incompatible err
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-09-02 18:52:10 -04:00
Aaron Lehmann
6cc38775bb
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>
2015-09-02 15:30:55 -07:00
John Howard
cfddca2bf9
Windows: Fix golint daemon breaking commit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-02 14:36:45 -07:00
John Howard
3715e60c71
Windows: Fix dockerfile ADD from HTTP
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-02 13:53:09 -07:00
Jessie Frazelle
2434bd8e63
Merge pull request #15935 from vdemeester/badges-all-the-things
...
Add more badges :)
2015-09-02 11:07:25 -07:00
Jessica Frazelle
12a71c8954
use apt-ftparchive and reprepro to enable apt-pinning;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-02 09:32:24 -07:00
Jessie Frazelle
8c5d511aa6
Merge pull request #16020 from runcom/remove-port-mapping-field
...
Remove PortMapping from container NetworkSettings
2015-09-02 09:10:38 -07:00
Nalin Dahyabhai
00ab6d9d47
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)
2015-09-02 11:41:42 -04:00
Antonio Murdaca
db4f20404d
Remove PortMapping from container NetworkSettings
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-02 14:32:53 +02:00
Suryakumar Sudar
dae50f9b5e
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>
2015-09-02 15:52:05 +05:30
Antonio Murdaca
9ea7267285
Merge pull request #16014 from angt/angt-patch-2
...
Fix typo
2015-09-02 11:25:12 +02:00
David Calavera
1ed3cb2b6c
Merge pull request #15921 from srust/volume_driver_register_retry
...
Retry registering a volume driver
2015-09-02 11:24:52 +02:00
Antonio Murdaca
4c54751cab
Merge pull request #16007 from toddjcrane/master
...
Normalized, ungrouped, and sorted names
2015-09-02 11:24:42 +02:00
angt
01059cba78
Fix typo
...
Signed-off-by: Adrien Gallouët <agallouet@gmail.com>
2015-09-02 10:43:49 +02:00
Todd Crane
ed14fe2afa
Normalized, ungrouped, and sorted names
...
Signed-off-by: Todd Crane <todd@toddcrane.com>
2015-09-01 21:57:01 -07:00
John Howard
6c56f917d3
Windows: Ensure workdir handled in platform semantics
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-01 18:50:41 -07:00
Jessie Frazelle
7f8954cb79
Merge pull request #15989 from tianon/ubuntu
...
Swap "ubuntu-debootstrap" for just "ubuntu"
2015-09-01 15:19:16 -07:00
Alexander Morozov
3111aa7293
Merge pull request #15988 from runcom/use-stringutils-strslice
...
Use StrSlice from pkg/stringutils
2015-09-01 14:32:58 -07:00
Tianon Gravi
a5eec723f8
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>
2015-09-01 14:03:49 -07:00