19c8e74fd3
Merge pull request #7100 from discordianfish/fix-port-allocation
...
Fix masked err in portmapper
2014-07-30 23:51:21 +03:00
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
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
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
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
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
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
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
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
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
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
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
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
63bd4ad9d6
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)
2014-07-30 14:01:43 +00:00
42a77de3d3
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)
2014-07-30 14:01:40 +00:00
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
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
0af7b5f83d
New job "log": logs a new event
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 11:20:33 +00:00
c2496d97cc
Move Server.ContainerAttach to Daemon.ContainerAttach
...
This is part of an effort to break apart the legacy server package. Help wanted!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-07-30 11:20:31 +00:00
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
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
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
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
3e1c1567ea
Add a cli integration test for recursive bind mounting.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-30 02:23:24 +00:00
d82bb603af
Make lxc driver rbind all user specified mounts.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-30 02:23:24 +00:00
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
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
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
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
1063b438eb
Merge pull request #7292 from erikh/buildfile_move
...
server/buildfile.go -> builder/builder.go
2014-07-29 15:38:42 -04:00
3bae02cbe3
Merge pull request #7272 from unclejack/create_httputils_pkg
...
move resumablerequestreader to pkg/httputils
2014-07-29 12:18:10 -07:00
38bce17904
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-29 13:07:59 -06:00
3a177ccd3a
server/buildfile.go -> builder/builder.go; add maintainers file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-29 11:35:02 -07:00
475131cd4a
Merge pull request #6877 from underscorephil/patch-1
...
Update softlayer.md
2014-07-29 13:20:55 -04:00
4749b884fe
Merge pull request #7256 from jstoja/docs-api-insert-image
...
Fixing docs - Insert api call
2014-07-29 13:19:22 -04:00
900d54b48b
Merge pull request #7269 from r0n22/patch-1
...
Update HTTP Proxy Section
2014-07-29 13:15:27 -04:00
c0517857f6
move resumablerequestreader to pkg
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-29 16:30:45 +03:00
3369b4f6f0
Merge pull request #7280 from knappe/patch-1
...
Correct Typo In Documentation
2014-07-29 19:15:48 +10:00
5931669343
fix docker integration-cli restart test race
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-28 23:46:14 -07:00
fc637b5275
Standardize "apt-get install" usage across the repo
...
I might have missed some, but I think this is most of the offenders.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-28 17:41:59 -06:00
ac3eecf3db
Merge pull request #7062 from crosbymichael/fix-lxc-caps
...
Fix cap drop issues with lxc
2014-07-28 16:19:08 -07:00
331200cbaa
Correct Typo In Documentation
2014-07-28 14:39:17 -06:00
a0dad3dfb2
Merge pull request #7274 from vbatts/vbatts-gh7136
...
progress bar: don't strings.Repeat a negative number
2014-07-28 11:50:16 -07:00
f906f31877
Merge pull request #7210 from fcarriedo/refactor-common-code
...
pkg/units: Refactor common code
2014-07-28 11:45:46 -07:00
704b97d1c4
jsonmessage: added test and cleaned up others
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-07-28 14:43:28 -04:00
5ef1126669
Merge pull request #6943 from tiborvass/parallel_compile_test
...
Parallel compile test binaries
2014-07-28 12:32:56 -06:00
d09e682c46
Merge pull request #6520 from unclejack/bump_go_to_1.3
...
bump Go to 1.3
2014-07-28 11:06:43 -07:00
380153f0d7
Merge pull request #7257 from seblu/master
...
Improve systemd units
2014-07-28 11:51:19 -06:00
77237be0e2
progress bar: don't strings.Repeat a negative number
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-07-28 12:01:43 -04:00
030676444a
Merge pull request #7140 from proppy/more-addtar-tests
...
integration-cli: add more tests for BuildAddTar
2014-07-28 11:58:29 -04:00
unclejack
Tibor Vass
Victor Vieux
Erik Hollensbe
Brian Goff
O.S. Tezer
Solomon Hykes
Vishnu Kannan
hollietealok
Tianon Gravi
James Turnbull
unclejack
Sven Dowideit
knappe
Vincent Batts
Michael Crosby