Commit Graph
9801 Commits
Author SHA1 Message Date
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
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
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
Brian Goff ba57d3d9e6 Replace old index image with hub
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-07-30 11:15:18 -04:00
O.S. Tezer 711fb3e19d 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)
2014-07-30 18:09:58 +03:00
unclejack c18b38f912 Merge pull request #7215 from tiborvass/add-os-to-docker-info
Add OS to docker info
2014-07-30 18:02:45 +03:00
Tibor Vass b0fb0055d2 Add OS to docker info
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-30 10:37:52 -04:00
Erik Hollensbe 4184cccb0f move testdata to tarsum package.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 06:52:24 -07:00
Erik Hollensbe 1219e458d1 utils/tarsum* -> pkg/tarsum
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-30 06:42:12 -07:00
Solomon Hykes 4949e070fb Move kernel version/capabilities detection to NewDaemon
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
Solomon Hykes e92a9e0b53 Move canonical root path detection to NewDaemon
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
Solomon Hykes a7d8c732b1 Move TMPDIR symlink cleanup to NewDaemon
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
Solomon Hykes 419b9fe164 Check for OS and root privileges in NewDaemon
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 09:26:51 +00:00
hollietealok 2b9d8248d6 Removed OAuth doc from mkdocs.yml
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
2014-07-29 13:56:19 -07:00
Tibor Vass 403df1765a Merge pull request #7286 from erikh/parsers
Move parsing functions to parsers/ and the specific kernel handling...
2014-07-29 16:11:31 -04:00
Erik Hollensbe 4398108433 Move parsing functions to pkg/parsers and the specific kernel handling
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-29 13:09:10 -07:00
Tianon Gravi 335e82f3f7 Merge pull request #7311 from tianon/travis-old-go
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
2014-07-29 13:48:24 -06:00
Tibor Vass 1063b438eb Merge pull request #7292 from erikh/buildfile_move
server/buildfile.go -> builder/builder.go
2014-07-29 15:38:42 -04:00