Solomon Hykes
8652830661
Move "kill" to daemon/kill.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-08-01 14:16:05 -04:00
Rajdeep Dua
4cb2cfed9f
Added test cases for no port passed to nat.ParsePortSpecs and negative port number passed
...
Docker-DCO-1.1-Signed-off-by: Rajdeep due <dua_rajdeep@yahoo.com> (github: rajdeepd)
2014-08-01 23:41:34 +05:30
Michael Crosby
5d2a62d8de
Merge pull request #7295 from vishh/rbind
...
Make lxc driver rbind all user specified mounts.
2014-08-01 10:25:45 -07:00
Erik Inge Bolsø
e6a084f4f8
networking.md: Networking between containers works without ip_forward
...
Docker-DCO-1.1-Signed-off-by: Erik Inge Bolsø <knan@redpill-linpro.com> (github: knan-linpro)
2014-08-01 10:41:16 +02:00
Ken ICHIKAWA
58588009c0
Btrfs graph driver is not experimental
...
Btrfs graph driver is not experimental now according to #4838 and CHANGELOG.md is saying "btrfs is no longer considered experimental.".
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
2014-08-01 14:37:38 +09:00
Sven Dowideit
503d124677
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
2014-08-01 11:43:37 +10:00
Michael Crosby
3490042836
Merge pull request #7362 from crosbymichael/fix-get-image-json
...
Fix get image json
2014-07-31 18:23:33 -07:00
Michael Crosby
63a4ba229c
Update package for repo and tag parser
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-31 18:19:30 -07:00
Fabio Falci
103ae23504
Fix getImagesJSON output for api less than 1.7
...
Tag can be a number, like centos:6.4, and so must be handled like a
string otherwise will lose quotation marks when converting to json
and the client (API < 1.7) will try to convert to int, failing
because the type is string. Additionally using ParseRepositoryTag to
parse repository names to split the tag because an URL can have : and
so more than one occurrence of : can be found on repository names.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-07-31 18:15:16 -07:00
Sven Dowideit
0fc304ce32
Merge pull request #7361 from SvenDowideit/merge-edit_dockerlinks
...
First pass at replacing parent-child metaphor to describe docker links.
2014-08-01 11:12:05 +10:00
Fred Lifton
631ea726e4
First pass at replacing parent-child metaphor to describe docker links.
...
Addresses issue #7141
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
a little git by
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: SvenDowideit)
2014-08-01 11:09:00 +10:00
Michael Crosby
5395cecc48
Merge pull request #7354 from timthelion/patch-8
...
Remove the restriction on multi-user PRs
2014-07-31 16:19:10 -07:00
Victor Vieux
90dadea84d
Merge pull request #7344 from shykes/cleanup-server-attach
...
Move container-related jobs out of deprecated server/ package
2014-07-31 15:56:48 -07:00
Michael Crosby
b1496effe3
Merge pull request #7312 from tianon/update-libcontainer
...
Bump libcontainer dep
2014-07-31 15:20:07 -07:00
Michael Crosby
c5cdbc376f
Merge pull request #7357 from crosbymichael/docker-ignore
...
Fix .dockerignore when ignoring unreadable dirs
2014-07-31 15:19:50 -07:00
Michael Crosby
8891e912b4
Return error for utils.Matches in archive
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-31 15:11:15 -07:00
Bruno Renié
27cca4c70c
Fix .dockerignore when ignoring unreadable dirs
...
The initial `ValidateContextDirectory` implementation fails loudly when a file
lacks read permissions in the current context. However that situation is valid
if the file is included in the `.dockerignore` patterns.
Docker-DCO-1.1-Signed-off-by: Bruno Renié <brutasse@gmail.com> (github: brutasse)
2014-07-31 15:10:56 -07:00
Timothy Hobbs
4c282b979b
Remove the restriction on multi-user PRs
...
This came up in #docker-dev today. We're not sure exactly why the original restriction was put it place. It is not well obeyed. Please comment if you know the origin of the restriction.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-07-31 22:05:29 +00:00
Solomon Hykes
ceffc9ea1d
Merge pull request #7152 from SvenDowideit/get-help-maintaining-softlayer-docs
...
MAINTAINERS: Get an extra pair of eyes on the Softlayer installation docs
2014-07-31 14:43:43 -07:00
Fred Lifton
eccc44fad6
Merge pull request #7327 from ostezer/fix-articles-https
...
Docs: articles/https minor amendments and update
2014-07-31 14:33:56 -07:00
James Turnbull
f77ae9b4f3
Merge pull request #7346 from proppy/patch-9
...
docs/google: bump container-vm image version
2014-07-31 17:22:01 -04:00
Tibor Vass
531f5907d6
Merge pull request #7324 from erikh/move_tarsum
...
Move tarsum to pkg/
2014-07-31 16:56:24 -04:00
Solomon Hykes
1f2d75774a
Merge pull request #7091 from erikh/rfe
...
Update CONTRIBUTING.md with links to sections and `Proposal:` process.
2014-07-31 12:28:05 -07:00
Michael Crosby
54b287bbc8
Merge pull request #7343 from shykes/cleanup-main
...
Cleanup main function
2014-07-31 12:26:09 -07:00
Aaron Huslage
32fdcaa419
Merge pull request #7193 from hollietealok/doc_remove
...
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
2014-07-31 15:19:58 -04:00
Erik Hollensbe
52db7b8cb7
Update CONTRIBUTING.md with links to sections and RFE process.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-31 12:18:31 -07:00
Tianon Gravi
8ea7242250
Update TestEnvironment to explicitly set "HOME" to be empty so it gets autofilled
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-31 12:46:41 -06:00
Tianon Gravi
f34d0e55f3
Remove pkg/user now that it's embedded in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-31 12:46:39 -06:00
Tianon Gravi
57b9467f45
Add support for autodetected HOME from USER (if HOME is unset)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-31 12:46:36 -06:00
Tianon Gravi
f4db3985d9
Bump libcontainer dep
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-31 12:46:35 -06:00
James Turnbull
b5ef212ec1
Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
...
Added GA universal analytics support
2014-07-31 09:00:08 -04:00
Jan Toebes
bfacdfdccf
Update nodejs_web_app.md
...
Updated to documentation to use the centos6 image instead of the unofficial tutum image of centos6.4
2014-07-31 08:54:22 +02:00
Johan Euphrosine
294f33b37a
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-30 22:50:05 -07:00
Tibor Vass
bbca4867f8
Merge pull request #7338 from tianon/moar-dotcloud
...
Fix more instances of "dotcloud/docker" in hack/
2014-07-30 23:51:23 -04:00
Sven Dowideit
970ebaa887
Merge pull request #7328 from cpuguy83/fix_search_image_oldindex
...
Replace old index image with hub
2014-07-31 12:06:30 +10:00
Michael Crosby
65d316e50d
Merge pull request #7340 from crosbymichael/tags-unit
...
Fix graph tags test on freebsd
2014-07-30 18:18:14 -07:00
Michael Crosby
6bc483fa59
Remove perm change in archive
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-30 18:06:48 -07:00
Kato Kazuyoshi
5ebe86ccf9
Fix graph/tags_unit_test.go on FreeBSD
...
- Directories should have u+x (0600 -> 0700)
- Don't chown files to root because we don't have to
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
2014-07-30 18:06:19 -07:00
Michael Crosby
2970ba4877
Merge pull request #7325 from tiborvass/case-insensitive-attach
...
Make --attach case-insensitive
2014-07-30 17:10:16 -07:00
Tianon Gravi
3a14eb066c
Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-30 17:02:04 -06:00
Roberto Gandolfo Hashioka
e13b1fc05f
Added GA universal analytics support
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
2014-07-30 15:32:14 -07:00
unclejack
19c8e74fd3
Merge pull request #7100 from discordianfish/fix-port-allocation
...
Fix masked err in portmapper
2014-07-30 23:51:21 +03:00
unclejack
3100afa0e1
Merge pull request #7298 from erikh/fix_cli_restart_test
...
fix docker integration-cli restart test race
2014-07-30 23:29:39 +03:00
Tibor Vass
a713413293
Make --attach case-insensitive
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-30 15:36:16 -04:00
Victor Vieux
8162c6eedd
Merge pull request #7317 from erikh/server_split
...
Partition server/ by image, init, events, container, and "everything left"
2014-07-30 12:28:37 -07:00
Tibor Vass
a0338ff04b
Merge pull request #7331 from erikh/simplify_checksum
...
Simplify utils.CheckSum.Read to use TeeReader instead
2014-07-30 15:14:41 -04:00
Erik Hollensbe
74fdadc86c
Partition server/ by image, init, events, container, and "everything left"
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 11:50:33 -07:00
Erik Hollensbe
ef6b78f7db
Remove CheckSum from utils; replace with a TeeReader
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 11:23:43 -07:00
unclejack
c3045f563d
Merge pull request #6962 from erikh/3349-cleanup-docker-socket
...
Clean up the docker socket on termination of the daemon.
2014-07-30 18:43:01 +03:00
Erik Hollensbe
ff02bea883
utils.Debugf -> fmt.Printf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 08:42:53 -07:00