5efe5e37f1
Merge pull request #14085 from moxiegirl/1.7-release-notes
...
Commenting out the release-notes for 1.6
Upstream-commit: abb85f822d057791afe0f5f883b267fb8bfe2691
Component: engine
2015-06-21 20:46:45 -07:00
42eb9b230f
Commenting out the release-notes for 1.6
...
Original text
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: efef353a297078a6036e071980e344e1534449e9
Component: engine
2015-06-21 20:41:43 -07:00
05447c46c6
Merge pull request #14062 from runcom/cleanup-dead-code
...
Remove dead code
Upstream-commit: c782be0e2a5c45bc31e1f3351e62679a4af3175a
Component: engine
2015-06-21 16:01:19 -07:00
0f1ff3d688
Merge pull request #14074 from sdurrheimer/master
...
Update the zsh completion
Upstream-commit: 4548d3fb776835bf39402d946c4d90836124d5e1
Component: engine
2015-06-21 15:43:09 -07:00
22bde0c0c1
Merge pull request #12099 from moysesb/12078-binary_remote_context
...
Handle binary remote contexts when creating builder jobs.
Upstream-commit: 7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7
Component: engine
2015-06-21 13:59:26 -07:00
c59f116283
Update the zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b2cc6f1b478f05c21ecd0c52ac6435480e53f472
Component: engine
2015-06-21 17:33:07 +02:00
3f04cb0ed2
Merge pull request #14051 from mavenugo/services
...
experimental services ui
Upstream-commit: fef0e84b2df31ba12fa46984e3564f9daa6f576d
Component: engine
2015-06-20 18:24:37 -07:00
36a670da43
Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2
...
fix #11094 - Allow 'docker import' to load from local files
Upstream-commit: 67f9bbcbd4d741e22e61b21a411cd904dcd4329c
Component: engine
2015-06-20 12:17:58 -07:00
f2307d3d6b
Initial Services docs
...
Signed-off-by: Dave Tucker <dt@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 4736b17315fdf9091e0d0a2f3ab9151227e0625a
Component: engine
2015-06-20 11:04:25 -07:00
cb3c5d7cf6
Support for --publish-service flag in docker run
...
This commit makes use of the CNM model supported by LibNetwork and
provides an ability to let a container to publish a specified service.
Behind the scenes, if a service with the given name doesnt exist, it is
automatically created on appropriate network and attach the container.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 1ac350a0ecfe9d28c82d6dff6a763a378ff9c472
Component: engine
2015-06-20 11:03:38 -07:00
35e8f92672
Remove dead code
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 927d13bc3c2030bb0e0429dbc500f13d72e7ccf6
Component: engine
2015-06-20 19:14:15 +02:00
c383ca49eb
Merge pull request #14054 from konstruktoid/issue_14045
...
rpm name and location
Upstream-commit: a93a5ee50a72c7a8bec60c362e98fb3af74d800c
Component: engine
2015-06-20 07:14:22 -07:00
8b52aa6697
work on #11094 allow import from local file
...
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net >
Upstream-commit: 3f64b76d4c66127466ce5b2ee0e8827eea7440b3
Component: engine
2015-06-20 09:04:43 +02:00
a48d868c8f
Merge pull request #14052 from Microsoft/10662-fixcgroupcheck
...
Windows: Fix cgroup regression
Upstream-commit: c3997daeb5db24fb1bd131d00cf3e7b87c2fe512
Component: engine
2015-06-19 21:17:39 -04:00
3ed8856a88
Merge pull request #13997 from runcom/drop-old-client
...
Error out if client API version is too old
Upstream-commit: e5ded9c378f4efdece8ed6e8d166198124956459
Component: engine
2015-06-19 17:05:39 -07:00
8bf35a9b77
rpm name and location
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
Upstream-commit: a0a010e2e3977f6f9e6271d3bb9e7abed783d47a
Component: engine
2015-06-20 01:14:58 +02:00
e0f70657f2
Windows: Fix cgroup regression
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9d0ed1dea076219115a6dc34a8c7e906cacf1e1a
Component: engine
2015-06-19 15:29:47 -07:00
445190b9a2
Merge pull request #14044 from duglin/MakeDocs
...
Add back top-level "make docs"
Upstream-commit: 7313a9ae9cbb8e4a289212d500095b63add237eb
Component: engine
2015-06-19 12:42:11 -07:00
265055473c
Support downloading remote tarball contexts in builder jobs.
...
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: d48bface59ef28aedc692c1f7c51a7ddde94a7fe
Component: engine
2015-06-19 16:35:00 -03:00
7ee7a352dd
Merge pull request #13780 from LK4D4/use_checkv
...
Remove timer and use -check.v for tests formatting
Upstream-commit: 7ce20fad9901f862be9bb7ca3081000e87f766ec
Component: engine
2015-06-19 11:34:31 -07:00
b743fc3790
Merge pull request #13848 from estesp/tls-server-client-cipher-cleanup
...
Split client and server cipher suite list in TLS defaults
Upstream-commit: de6d2603f9e10c1b192fa23d22e4b3f54116808a
Component: engine
2015-06-19 11:08:19 -07:00
f8a5e3177d
Merge pull request #14032 from lizf-os/fix-sysinfo-regression
...
Fix sysinfo regression
Upstream-commit: 3ee67caf3b97f3df37960063c675ebadfe41adb3
Component: engine
2015-06-19 11:00:13 -07:00
d5807c20a4
Add back top-level "make docs"
...
Just to make life easier on devs so they don't need to 'cd' into
the docs dir just to test their docs edits. This doesn't do anything
more than "cd docs && make docs" so that all of the smarts are still
in the docs's Makefile and not in docker's.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 2bc0d2bf511fdea831817ab9aaff1b5aab7c86a2
Component: engine
2015-06-19 09:42:39 -07:00
c903006e39
Merge pull request #14023 from mavenugo/net_ui
...
experimental network ui
Upstream-commit: df73d5e0cda8cbcbb938b72b83c39a7222643dce
Component: engine
2015-06-19 09:26:05 -07:00
4d14f9391a
attaching services api and UI chain to docker parent
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 742db1737c26b07fb08f46ce7391586aec674dd1
Component: engine
2015-06-19 09:19:09 -07:00
46e26ed16e
Fix sysinfo regression
...
The cleanup to sysinfo package introduced a regression.
If memory cgroup isn't supported and --memory is specified when
starting a container, we should return info instead of nil in
checkCgroupMem(), otherwise we'll access a nil pointer.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: 439869320177f56a559ef189f5ce29f24cf99e12
Component: engine
2015-06-19 09:44:23 +08:00
3dcbe20722
Merge pull request #14031 from tianon/update-frozen-images
...
Update frozen busybox and hello-world images
Upstream-commit: b3254dab494a76f99f6e22cb54f3de571e9436c8
Component: engine
2015-06-18 18:15:45 -07:00
65d0d94a98
Update frozen busybox and hello-world images
...
These have both been updated to no longer include the empty "scratch" layer, and `hello-world` has a fix for http->https.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 4d171281bf88b07a9dc2096a86091cf5d3b11270
Component: engine
2015-06-18 17:09:57 -07:00
767f006e91
Merge pull request #14028 from jfrazelle/fix-index-generation-experimental
...
fix s3_url for release script for experimental
Upstream-commit: 1334a2fc391a0c3b4ae314e8122b1a10ea4de4a5
Component: engine
2015-06-18 15:22:26 -07:00
2323aa861a
fix s3_url for release script for experimental
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0f0f5ecd578d5d351b63b4d1799168ba5b3eef0c
Component: engine
2015-06-18 14:54:40 -07:00
9e396973a1
Remove timer and use -check.v for tests formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 4253a1f87ee90e3827090dc380bfda2332e23ff3
Component: engine
2015-06-18 14:22:40 -07:00
5736bb1274
Merge pull request #13978 from cpuguy83/cleanup_sysinfo
...
cleanup sysinfo package
Upstream-commit: d7544217dd5acf327944398811337b6994117618
Component: engine
2015-06-18 22:27:32 +02:00
15774a14e5
Merge pull request #13218 from brahmaroutu/decoder_issue_gccgo
...
Decoder does not work properly with nested pointers using gcc
Upstream-commit: b1143f4cb097461760ccde1499069c806f8f94af
Component: engine
2015-06-18 13:22:28 -07:00
b5397731fd
Merge pull request #14016 from vizv/patch-1
...
fix the url in article "Best practices for writing Dockerfiles"
Upstream-commit: 1487350b85321cef1bc0d194b81f07428dab4b27
Component: engine
2015-06-18 13:05:26 -07:00
48c6fd9201
Merge pull request #13976 from icecrime/12934_carry
...
LXC execdriver compatibility with recent LXC versions
Upstream-commit: ebef527b39ccfeed3a179a1f8afbccd7f12c748f
Component: engine
2015-06-18 15:08:55 -04:00
9ce0558aba
Network UI / API docs
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: cca990c67a3132d46e0157878507138aa2c6d2e5
Component: engine
2015-06-18 12:07:58 -07:00
4c8d2626b0
register libnetwork API and UI with docker parent chain
...
This commit also brings in the ability to specify a default network and its
corresponding driver as daemon flags. This helps in existing clients to
make use of newer networking features provided by libnetwork.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: da5a3e6dee80f1f5d4059851e4762ffb0484f7e9
Component: engine
2015-06-18 12:07:58 -07:00
543f9cd356
Merge pull request #14019 from jfrazelle/bump-version
...
Bump version
Upstream-commit: 8ea1b54065fc1285ca1635bae9a6151f52351b92
Component: engine
2015-06-18 11:25:19 -07:00
5502c173d4
bump version to 1.8.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 53f5f5b7f49f2d8039f59c5ad68070a22db27330
Component: engine
2015-06-18 10:47:53 -07:00
5fe7159b02
Bump version to v1.7.0
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
(cherry picked from commit 0baf60984522744eed290348f33f396c046b2f3a)
Upstream-commit: 2e0e038fb2d2b69e8b7ee42ed1218220632f0c90
Component: engine
2015-06-18 10:47:25 -07:00
a4ba2df73f
Fix the url in comparison of "COPY" and "RUN curl"
...
From context on next line,`tar -xJC` implies
the file is `big.tar.xz` instead of `big.tar.gz`.
Signed-off-by: Wenxuan Zhao <viz@linux.com >
Upstream-commit: 3dd134cecaa045e73706c6ce4ab55188e98d1066
Component: engine
2015-06-18 12:33:46 -04:00
53e65f3de7
Merge pull request #13830 from clnperez/check-apparmor-file-first
...
Check for apparmor file before reading it
Upstream-commit: fc793bf1a3bbdd93fc674afc02bad9d64c97bfb8
Component: engine
2015-06-18 08:18:01 -04:00
f3684edb38
Error out if client API version is too old
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 910322a8935a45b6b69255edd3e06c8fef97feda
Component: engine
2015-06-18 11:03:07 +02:00
d80aedc3b4
Merge pull request #14002 from moxiegirl/hugo-test-fixes
...
Hugo final 1.7 Documentation PR -- please read carefully
Upstream-commit: 423e6dc333b72a0ca48a104af866a3c20c9c097e
Component: engine
2015-06-17 22:00:09 -07:00
c6caf278a1
Fixing seds, deleting old stuff
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upding sed, adding script to avoid redirects, remove mkdos
Signed-off-by: Mary Anthony <mary@docker.com >
Ignoring graphics with sed
Signed-off-by: Mary Anthony <mary@docker.com >
Fixing kitematic image
Signed-off-by: Mary Anthony <mary@docker.com >
Removing draft
Signed-off-by: Mary Anthony <mary@docker.com >
Fixing link
Signed-off-by: Mary Anthony <mary@docker.com >
removing from the menu
Signed-off-by: Mary Anthony <mary@docker.com >
Updatiing order of project material
Signed-off-by: Mary Anthony <mary@docker.com >
Removing from Regsitry v2 content per Olivier
Signed-off-by: Mary Anthony <mary@docker.com >
tweaking the touchup
Signed-off-by: Mary Anthony <mary@docker.com >
Removing include; only used four places; hugo global var replace
Signed-off-by: Mary Anthony <mary@docker.com >
Entering fixes from page-by-page
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677
Component: engine
2015-06-17 21:05:37 -07:00
88ce8cdf94
Merge pull request #13991 from LalatenduMohanty/adding_new_scientists
...
Proposing Chandrasekhar, Khorana, Saha for name-generator
Upstream-commit: baa166447858619727b17bdf6ea082b7e5545415
Component: engine
2015-06-17 21:06:24 -04:00
73618ddb2e
cleanup sysinfo package
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9b05aa6ee8e628695b3661b2c5a438f61330ba53
Component: engine
2015-06-17 20:41:14 -04:00
42b7264397
Merge pull request #13070 from shishir-a412ed/cleanup_cmd_tag
...
Use distribution's ValidateRepositoryName for remote name validation.
Upstream-commit: 206acbcf89d2f499b4c8423fb121516d88226a24
Component: engine
2015-06-17 23:26:27 +02:00
b387e8ade7
Merge pull request #13575 from mattmoor/consistent-push-fallback
...
Make v2 push have v1-fallback behavior consistent with pull.
Upstream-commit: d86345b9f722c187afd4af8a92583fc07506b5d9
Component: engine
2015-06-17 13:41:58 -07:00
40e0bc3295
Merge pull request #13988 from runcom/fix-old-code-path-removal
...
Remove missed code path for api < 1.12
Upstream-commit: af845d42a586493c5f298b47952bbf59f563307e
Component: engine
2015-06-17 12:30:11 -07:00
