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
Solomon Hykes
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
Solomon Hykes
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
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
Timothy
fae72c83be
Apply @jamtur01's copy edit's to certificates.md
...
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-30 16:23:56 +03:00
Solomon Hykes
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
Solomon Hykes
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
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
Vishnu Kannan
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
Vishnu Kannan
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
Daniel Nephin
c0450f7df0
Resolves #366 , non-pinned versions in setup.py:install_requires
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2014-07-29 17:13:22 -07: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
Victor Vieux
3bae02cbe3
Merge pull request #7272 from unclejack/create_httputils_pkg
...
move resumablerequestreader to pkg/httputils
2014-07-29 12:18:10 -07:00
Tianon Gravi
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
Erik Hollensbe
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
James Turnbull
475131cd4a
Merge pull request #6877 from underscorephil/patch-1
...
Update softlayer.md
2014-07-29 13:20:55 -04:00
James Turnbull
4749b884fe
Merge pull request #7256 from jstoja/docs-api-insert-image
...
Fixing docs - Insert api call
2014-07-29 13:19:22 -04:00
James Turnbull
900d54b48b
Merge pull request #7269 from r0n22/patch-1
...
Update HTTP Proxy Section
2014-07-29 13:15:27 -04:00
unclejack
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
unclejack
372f9bb58b
integcli: use dockerCmdInDir in build tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-29 16:01:56 +03:00
unclejack
f60c8e9e61
integcli: add some more docker utils
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-29 15:56:41 +03:00
Sven Dowideit
3369b4f6f0
Merge pull request #7280 from knappe/patch-1
...
Correct Typo In Documentation
2014-07-29 19:15:48 +10:00
Erik Hollensbe
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
d11wtq
847ec5b559
Update dockerpty -> 0.2.3
...
Signed-off-by: d11wtq <chris@w3style.co.uk >
2014-07-29 01:17:28 +00:00
Tianon Gravi
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
Aanand Prasad
09ffa101ed
Merge pull request #362 from orchardup/add-flake8-to-test-script
...
Add flake8 to test script
2014-07-28 16:34:07 -07:00
Ben Firshman
01e2b56405
Add flake8 to test script
...
For those who don't use tox.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-28 16:27:57 -07:00
Victor Vieux
ac3eecf3db
Merge pull request #7062 from crosbymichael/fix-lxc-caps
...
Fix cap drop issues with lxc
2014-07-28 16:19:08 -07:00
Solomon Hykes
0aa4e1e2d7
Merge pull request #102 from bfirsh/ignore-godeps-workspace
...
Ignore godep workspace
2014-07-28 16:13:40 -07:00
Ben Firshman
2f6c763703
Merge pull request #353 from dnephin/add_flake8
...
Add flake8
2014-07-28 22:35:51 +01:00