ddcedb45f4
Merge pull request #7362 from crosbymichael/fix-get-image-json
...
Fix get image json
Upstream-commit: 34900428361b466b7a7051fd250146a778e06f51
Component: engine
2014-07-31 18:23:33 -07:00
76040cafd8
Update package for repo and tag parser
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 63a4ba229cd3da6ce7bc52e6b9f78d9cd631398d
Component: engine
2014-07-31 18:19:30 -07:00
574263662b
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)
Upstream-commit: 103ae23504b9fdc52e4f7d4a50798553af09bfe5
Component: engine
2014-07-31 18:15:16 -07:00
3267146e97
Merge pull request #7361 from SvenDowideit/merge-edit_dockerlinks
...
First pass at replacing parent-child metaphor to describe docker links.
Upstream-commit: 0fc304ce3252f9489c227f711755625058aee1f3
Component: engine
2014-08-01 11:12:05 +10:00
c8eb8f3b81
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)
Upstream-commit: 631ea726e425713415e7a991f9a813d02b3f6d75
Component: engine
2014-08-01 11:09:00 +10:00
16376f322d
Merge pull request #7354 from timthelion/patch-8
...
Remove the restriction on multi-user PRs
Upstream-commit: 5395cecc48d278af26c2a8982c776af9a8dd96ac
Component: engine
2014-07-31 16:19:10 -07:00
78f07b7ada
Merge pull request #7344 from shykes/cleanup-server-attach
...
Move container-related jobs out of deprecated server/ package
Upstream-commit: 90dadea84dc08e2ea12800b8c3b708885dbb16e2
Component: engine
2014-07-31 15:56:48 -07:00
85222943a2
Merge pull request #7312 from tianon/update-libcontainer
...
Bump libcontainer dep
Upstream-commit: b1496effe37ef6161faf0b4e987f4261329c0a66
Component: engine
2014-07-31 15:20:07 -07:00
1d296af9b5
Merge pull request #7357 from crosbymichael/docker-ignore
...
Fix .dockerignore when ignoring unreadable dirs
Upstream-commit: c5cdbc376ffaa1ed9db038e93acaa1fc689433b6
Component: engine
2014-07-31 15:19:50 -07:00
88915cec66
Return error for utils.Matches in archive
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 8891e912b44c4ff597f7a45658c4d3030d730c98
Component: engine
2014-07-31 15:11:15 -07:00
604012d742
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)
Upstream-commit: 27cca4c70cc7f0cccfda693ca7bbb2422eec3e13
Component: engine
2014-07-31 15:10:56 -07:00
8dc0828a88
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)
Upstream-commit: 4c282b979b717a28dd7699ad5b124d82b6a99a29
Component: engine
2014-07-31 22:05:29 +00:00
5fde8856c0
Merge pull request #7152 from SvenDowideit/get-help-maintaining-softlayer-docs
...
MAINTAINERS: Get an extra pair of eyes on the Softlayer installation docs
Upstream-commit: ceffc9ea1d9250f6a41d51c6b766dbd98580eeca
Component: engine
2014-07-31 14:43:43 -07:00
2a308976e9
Merge pull request #7327 from ostezer/fix-articles-https
...
Docs: articles/https minor amendments and update
Upstream-commit: eccc44fad62f8f31a89301ad9f9031fff8bbe661
Component: engine
2014-07-31 14:33:56 -07:00
dfe12ec6ad
Merge pull request #7346 from proppy/patch-9
...
docs/google: bump container-vm image version
Upstream-commit: f77ae9b4f3a71b0a572149561ca29ce9973ff4ab
Component: engine
2014-07-31 17:22:01 -04:00
be277e6761
Merge pull request #7324 from erikh/move_tarsum
...
Move tarsum to pkg/
Upstream-commit: 531f5907d64ff56b0beea1de11d65885e29ee5ad
Component: engine
2014-07-31 16:56:24 -04:00
fabf07b042
Merge pull request #7091 from erikh/rfe
...
Update CONTRIBUTING.md with links to sections and `Proposal:` process.
Upstream-commit: 1f2d75774ad1ab67555699fd25c0734061f36a9b
Component: engine
2014-07-31 12:28:05 -07:00
0c3330ed80
Merge pull request #7343 from shykes/cleanup-main
...
Cleanup main function
Upstream-commit: 54b287bbc81216a2663b776f536ad40193a87bf1
Component: engine
2014-07-31 12:26:09 -07:00
c795cf8d33
Merge pull request #7193 from hollietealok/doc_remove
...
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
Upstream-commit: 32fdcaa4192577b629bb622991804f9f9148e823
Component: engine
2014-07-31 15:19:58 -04:00
5d2d55c083
Update CONTRIBUTING.md with links to sections and RFE process.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 52db7b8cb7d3408753156e8e33766c049bcc3cfe
Component: engine
2014-07-31 12:18:31 -07:00
15ebfed254
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)
Upstream-commit: 8ea72422502d65421bc36dda48d384588f519a77
Component: engine
2014-07-31 12:46:41 -06:00
0a4008fdb8
Remove pkg/user now that it's embedded in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f34d0e55f3a1f15abf28680d84ab48d40ffafbc1
Component: engine
2014-07-31 12:46:39 -06:00
cdc00db1ec
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)
Upstream-commit: 57b9467f45571c1bd98ebe4b73c6cf3d97ff051c
Component: engine
2014-07-31 12:46:36 -06:00
4796299987
Bump libcontainer dep
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: f4db3985d9b6ce481437c9524bb33640d602a2cb
Component: engine
2014-07-31 12:46:35 -06:00
cf3f6d4b4d
Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
...
Added GA universal analytics support
Upstream-commit: b5ef212ec17932dc159a44f2a77c6e9d4cf4ee9d
Component: engine
2014-07-31 09:00:08 -04:00
ebf6bae6b0
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 294f33b37a2d029164728534e781bc118d6689c2
Component: engine
2014-07-30 22:50:05 -07:00
33f1ef65b6
Merge pull request #7338 from tianon/moar-dotcloud
...
Fix more instances of "dotcloud/docker" in hack/
Upstream-commit: bbca4867f8f5ecda47c7e34ddc3544aff8f2e3bd
Component: engine
2014-07-30 23:51:23 -04:00
aaca9c7303
Merge pull request #7328 from cpuguy83/fix_search_image_oldindex
...
Replace old index image with hub
Upstream-commit: 970ebaa887f0f43c8ca2549ff9a7ca07c32e1fca
Component: engine
2014-07-31 12:06:30 +10:00
463d8552c2
Merge pull request #7340 from crosbymichael/tags-unit
...
Fix graph tags test on freebsd
Upstream-commit: 65d316e50d8cb5ae2b4ff4f721d428ff30108148
Component: engine
2014-07-30 18:18:14 -07:00
8511e76574
Remove perm change in archive
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 6bc483fa59adc0be65ea9c804c69d861a02435bd
Component: engine
2014-07-30 18:06:48 -07:00
5d2578de83
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)
Upstream-commit: 5ebe86ccf9bedf439b2c90e26dee0f27c0c116f9
Component: engine
2014-07-30 18:06:19 -07:00
6b69ddd081
Merge pull request #7325 from tiborvass/case-insensitive-attach
...
Make --attach case-insensitive
Upstream-commit: 2970ba487766f51d0d8f5d026e981abec55c1519
Component: engine
2014-07-30 17:10:16 -07:00
4d9e0d4b74
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)
Upstream-commit: 3a14eb066cef537e52f96c6ad76adab2efe02e05
Component: engine
2014-07-30 17:02:04 -06:00
8454954b93
Added GA universal analytics support
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
Upstream-commit: e13b1fc05f5caaa324678b7da2fc917943557185
Component: engine
2014-07-30 15:32:14 -07:00
625730681d
Merge pull request #7100 from discordianfish/fix-port-allocation
...
Fix masked err in portmapper
Upstream-commit: 19c8e74fd3deeae7a22eb4c502acd2b9f3072ab0
Component: engine
2014-07-30 23:51:21 +03:00
69a9f824be
Merge pull request #7298 from erikh/fix_cli_restart_test
...
fix docker integration-cli restart test race
Upstream-commit: 3100afa0e19f9fe36a6de304212998e357c1f3e0
Component: engine
2014-07-30 23:29:39 +03:00
d3b2916a28
Make --attach case-insensitive
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: a7134132933d899f30ab775ac9604ff4e87d7c8d
Component: engine
2014-07-30 15:36:16 -04:00
69c6e53156
Merge pull request #7317 from erikh/server_split
...
Partition server/ by image, init, events, container, and "everything left"
Upstream-commit: 8162c6eeddccb6e74c1982206f40f72129dcca82
Component: engine
2014-07-30 12:28:37 -07:00
aaa8e88106
Merge pull request #7331 from erikh/simplify_checksum
...
Simplify utils.CheckSum.Read to use TeeReader instead
Upstream-commit: a0338ff04be1d478e16ccd476a12e1c045fa6a5e
Component: engine
2014-07-30 15:14:41 -04:00
69c59dfd2b
Partition server/ by image, init, events, container, and "everything left"
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 74fdadc86cf8ecb90604f0e2feb087dc82227cb0
Component: engine
2014-07-30 11:50:33 -07:00
8be33461d7
Remove CheckSum from utils; replace with a TeeReader
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: ef6b78f7db890a79b40484fd892ff486017ff2e9
Component: engine
2014-07-30 11:23:43 -07:00
d495064880
Merge pull request #6962 from erikh/3349-cleanup-docker-socket
...
Clean up the docker socket on termination of the daemon.
Upstream-commit: c3045f563d68217a4f8887c762adb2939378b657
Component: engine
2014-07-30 18:43:01 +03:00
11a2f7d8c4
utils.Debugf -> fmt.Printf
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: ff02bea88302dcd21345f7e4258400b58b9c142b
Component: engine
2014-07-30 08:42:53 -07:00
a0d04e4cbb
Replace old index image with hub
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: ba57d3d9e63445f43e4d53da44e8dec27baa288d
Component: engine
2014-07-30 11:15:18 -04:00
41bdc73a7f
Docs: articles/https minor amendments and update
...
This commit proposes some minor amendments and updates
for the articles/https.md document to fix certain errors, inc.:
- Marking commands / flags as code (e.g. `tlsverify`) [done before rebase]
- Capitalising the word Docker
- Normalizing headers to match the rest of the docs;
- Expanding the page description to match the page title and the content;
- Capitalizing HTTPS etc.;
- Some spelling error fixes;
- Line-length adjustments to make it easier to read the raw file.
It does not propose any fundemental changes to the structure of the document.
Certain changes were based before another update on this doc.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 711fb3e19d4caf7f084d8d1eaca85cfbaef6e978
Component: engine
2014-07-30 18:09:58 +03:00
362bc99b19
Merge pull request #7215 from tiborvass/add-os-to-docker-info
...
Add OS to docker info
Upstream-commit: c18b38f912d08105177630718a78562186ae7324
Component: engine
2014-07-30 18:02:45 +03:00
ca4826fd77
Add OS to docker info
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: b0fb0055d279bc25aa2f91c112929ea8eb92c1db
Component: engine
2014-07-30 10:37:52 -04:00
9698011529
Move "unpause" to daemon/pause.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)
Upstream-commit: 63bd4ad9d6d0c55691ff33cbfd24684ef91649e4
Component: engine
2014-07-30 14:01:43 +00:00
f0afd9ad9a
Move "pause" to daemon/pause.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)
Upstream-commit: 42a77de3d3867e2f34b455fc343e293eed994dcd
Component: engine
2014-07-30 14:01:40 +00:00
3d1163e7b4
move testdata to tarsum package.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 4184cccb0f291b329292da1a31108407cb1a4750
Component: engine
2014-07-30 06:52:24 -07:00
