Solomon Hykes
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
Solomon Hykes
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
Erik Hollensbe
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
Erik Hollensbe
5a8e5fe7dc
utils/tarsum* -> pkg/tarsum
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 1219e458d105461fd7de23fa4b04a1233f61f8a4
Component: engine
2014-07-30 06:42:12 -07:00
Solomon Hykes
cf5bb0be0a
New job "log": logs a new event
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 0af7b5f83d7f66a013e9bd66a9b4066a1de4eae8
Component: engine
2014-07-30 11:20:33 +00:00
Solomon Hykes
af5f787532
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)
Upstream-commit: c2496d97cc58e0720988acf4e989689945bb3a54
Component: engine
2014-07-30 11:20:31 +00:00
Solomon Hykes
409af56c06
Move kernel version/capabilities detection to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 4949e070fbcac1ef9fbeabe59e3f39cdb830e5fd
Component: engine
2014-07-30 09:26:51 +00:00
Solomon Hykes
f3b5291fed
Move canonical root path detection to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: e92a9e0b53d296f6e0caa925a56ebbd76b20acaa
Component: engine
2014-07-30 09:26:51 +00:00
Solomon Hykes
504ecb28ba
Move TMPDIR symlink cleanup to NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: a7d8c732b1760fcb3d5fb99c035a34123809e9cd
Component: engine
2014-07-30 09:26:51 +00:00
Solomon Hykes
190fbe906e
Check for OS and root privileges in NewDaemon
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 419b9fe16425c301855aab781e1386f7a227a09d
Component: engine
2014-07-30 09:26:51 +00:00
Vishnu Kannan
90b29cb0b4
Add a cli integration test for recursive bind mounting.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 3e1c1567eac59c7b808d37aa45f82ce67227e59c
Component: engine
2014-07-30 02:23:24 +00:00
Vishnu Kannan
bf7a3474f4
Make lxc driver rbind all user specified mounts.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: d82bb603afab96a83ff58090ff807af5d55adc48
Component: engine
2014-07-30 02:23:24 +00:00
hollietealok
4d9bca3054
Removed OAuth doc from mkdocs.yml
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
Upstream-commit: 2b9d8248d6136645d3801693370e23d752f748f2
Component: engine
2014-07-29 13:56:19 -07:00
Tibor Vass
fdbe4305c1
Merge pull request #7286 from erikh/parsers
...
Move parsing functions to parsers/ and the specific kernel handling...
Upstream-commit: 403df1765abfd3ac62b7f6b8bd709fb0d691d8c8
Component: engine
2014-07-29 16:11:31 -04:00
Erik Hollensbe
e25f77248d
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)
Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a
Component: engine
2014-07-29 13:09:10 -07:00
Tianon Gravi
8545bf6daa
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
Upstream-commit: 335e82f3f7abfcf783bead6e38b7a3aefe0c768a
Component: engine
2014-07-29 13:48:24 -06:00
Tibor Vass
887f270676
Merge pull request #7292 from erikh/buildfile_move
...
server/buildfile.go -> builder/builder.go
Upstream-commit: 1063b438eb149ddc9b899c38a06cc1e666d512bf
Component: engine
2014-07-29 15:38:42 -04:00
Victor Vieux
b812e976e3
Merge pull request #7272 from unclejack/create_httputils_pkg
...
move resumablerequestreader to pkg/httputils
Upstream-commit: 3bae02cbe32b856107a5d61c496f35d69c35aa2d
Component: engine
2014-07-29 12:18:10 -07:00
Tianon Gravi
981a6f43de
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)
Upstream-commit: 38bce179040c80512c39c42ebbf776e58ac3dfcf
Component: engine
2014-07-29 13:07:59 -06:00
Erik Hollensbe
17543b1068
server/buildfile.go -> builder/builder.go; add maintainers file
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 3a177ccd3afdfe481a7248fccb2efe0f2cbdfcca
Component: engine
2014-07-29 11:35:02 -07:00
James Turnbull
d0658f2e0a
Merge pull request #6877 from underscorephil/patch-1
...
Update softlayer.md
Upstream-commit: 475131cd4a5ef8178e36bf40721baf14ce2b6e26
Component: engine
2014-07-29 13:20:55 -04:00
James Turnbull
8323f096b4
Merge pull request #7256 from jstoja/docs-api-insert-image
...
Fixing docs - Insert api call
Upstream-commit: 4749b884fe162edbd303fe6cc23223a7be9b9226
Component: engine
2014-07-29 13:19:22 -04:00
James Turnbull
e9f01897da
Merge pull request #7269 from r0n22/patch-1
...
Update HTTP Proxy Section
Upstream-commit: 900d54b48b3091f9bd03f254d5ac9e458bdd53d9
Component: engine
2014-07-29 13:15:27 -04:00
unclejack
b7f9603931
move resumablerequestreader to pkg
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: c0517857f64d1148d02809e3ba3dd39bf8322ed3
Component: engine
2014-07-29 16:30:45 +03:00
unclejack
93bee1a9de
integcli: use dockerCmdInDir in build tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 372f9bb58b820b85ed1975ea713958b684c17e94
Component: engine
2014-07-29 16:01:56 +03:00
unclejack
cc850d8d72
integcli: add some more docker utils
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: f60c8e9e6154629de8eaa19bfa0f52b2be4791e5
Component: engine
2014-07-29 15:56:41 +03:00
Sven Dowideit
c30e5bea2d
Merge pull request #7280 from knappe/patch-1
...
Correct Typo In Documentation
Upstream-commit: 3369b4f6f03f400d7c6d3dbf1a86401d983503be
Component: engine
2014-07-29 19:15:48 +10:00
Erik Hollensbe
39b46f69f1
fix docker integration-cli restart test race
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 5931669343f568114cb209dabf8913be44cd63e8
Component: engine
2014-07-28 23:46:14 -07:00
Tianon Gravi
e2390724e7
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)
Upstream-commit: fc637b5275c2fe23c9857a34316a783042d906b8
Component: engine
2014-07-28 17:41:59 -06:00
Victor Vieux
c827ecda15
Merge pull request #7062 from crosbymichael/fix-lxc-caps
...
Fix cap drop issues with lxc
Upstream-commit: ac3eecf3db5f81a553b71267f2e18ca7b7d95fea
Component: engine
2014-07-28 16:19:08 -07:00
knappe
bed02719c0
Correct Typo In Documentation
...
Upstream-commit: 331200cbaae75a2876bac037c8df2e609bab9658
Component: engine
2014-07-28 14:39:17 -06:00
Victor Vieux
80ac009e50
Merge pull request #7274 from vbatts/vbatts-gh7136
...
progress bar: don't strings.Repeat a negative number
Upstream-commit: a0dad3dfb22a5d09d01bb886caece26950d17b61
Component: engine
2014-07-28 11:50:16 -07:00
Victor Vieux
2a6df8d538
Merge pull request #7210 from fcarriedo/refactor-common-code
...
pkg/units: Refactor common code
Upstream-commit: f906f31877f63a7f9fab954157667e0f341210ba
Component: engine
2014-07-28 11:45:46 -07:00
Vincent Batts
b178420296
jsonmessage: added test and cleaned up others
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 704b97d1c4cc6eaa6ecf9630eed2dffd5abaffb9
Component: engine
2014-07-28 14:43:28 -04:00
Jan Toebes
65df9ecf1a
Update nodejs_web_app.md
...
The image centos:centos6.4 doesn't exist. Instead you have to choose between the official centos6 or centos7. Both images does not work together with de yum npm install. When choosing an centos6.5 from another distributor (tutum) it works.
Upstream-commit: 2519872d77da8cb6a9c5f55e44cfaeb9cd603978
Component: engine
2014-07-28 20:43:24 +02:00
Tianon Gravi
ec6e0ee58c
Merge pull request #6943 from tiborvass/parallel_compile_test
...
Parallel compile test binaries
Upstream-commit: 5ef1126669ee6fac50679e4d65d1eb822a59fbec
Component: engine
2014-07-28 12:32:56 -06:00
Michael Crosby
63538328fe
Merge pull request #6520 from unclejack/bump_go_to_1.3
...
bump Go to 1.3
Upstream-commit: d09e682c46befb37a3dd47375b885d91c437c1f2
Component: engine
2014-07-28 11:06:43 -07:00
Tianon Gravi
9833b2f84a
Merge pull request #7257 from seblu/master
...
Improve systemd units
Upstream-commit: 380153f0d7e2c3a285ebf2f43306d99aa6c8dd9a
Component: engine
2014-07-28 11:51:19 -06:00
Vincent Batts
ddd05d0cc1
progress bar: don't strings.Repeat a negative number
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 77237be0e23dfaba4d4d97a525c3ecc7fb819042
Component: engine
2014-07-28 12:01:43 -04:00
Tibor Vass
93d0b8352d
Merge pull request #7140 from proppy/more-addtar-tests
...
integration-cli: add more tests for BuildAddTar
Upstream-commit: 030676444ade28ded0953ff179d65fe99bbf4fed
Component: engine
2014-07-28 11:58:29 -04:00
Tibor Vass
3fc02efa64
Merge pull request #7209 from LK4D4/test_build_from_git
...
Test on building from GIT url
Upstream-commit: da40d9b7a50704b0ff28f885dc4e87ffb77cd01b
Component: engine
2014-07-28 11:15:50 -04:00
unclejack
4eed6ed770
Merge pull request #7097 from LK4D4/fix_eof_dockerignore_#7093
...
Skip whole dir dockerignoring with warning
Upstream-commit: 7978b3212789203ffe75af60792d85132fb1c519
Component: engine
2014-07-28 17:34:44 +03:00
r0n22
eec1c749e5
Update HTTP Proxy Section
...
Docker.service file location was missing the /usr dir.
Upstream-commit: 2095e22121833e5d38890c321a7a67ead405e3ec
Component: engine
2014-07-28 09:39:55 -04:00
Sébastien Luttringer
4569bccd5e
Systemd service should not restart on failure
...
This should not be done by default but used by adminsys with a drop-in.d file,
for buggy daemons which crash without known fixes.
Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net > (github: seblu)
Upstream-commit: 533916fa6bb0b19fb887b5b0b2b704b224154b41
Component: engine
2014-07-28 11:50:24 +02:00
Sébastien Luttringer
d687489711
Systemd .service should install .socket
...
And remove the WantedBy directive.
See: https://bugs.archlinux.org/task/41338
Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net > (github: seblu)
Upstream-commit: 0f26195a8ddd0bde95865816576d827a9ed0727c
Component: engine
2014-07-28 00:18:14 +02:00
Sébastien Luttringer
e1fb484158
Fix ordering in systemd service file
...
See: https://bugs.archlinux.org/task/41338
Docker-DCO-1.1-Signed-off-by: Sébastien Luttringer <seblu@seblu.net > (github: seblu)
Upstream-commit: fe68df36fc9c85ae30af9bf53a13e8af0534e613
Component: engine
2014-07-28 00:17:40 +02:00
Francisco Carriedo
f378b5d004
pkg/units: Updated tests with unit constants
...
Also, now that I was at it, gave them a small refactor.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
Upstream-commit: 81c7d28b842844778a652b7353f52332f4276afb
Component: engine
2014-07-26 20:00:18 -07:00
Francisco Carriedo
3b6e93d717
pkg/units: Unit constants directly int64
...
int64 seems sufficient
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
Upstream-commit: c7a2e86b5186acb58999d7b2b3a85a9bb4421b1f
Component: engine
2014-07-26 20:00:08 -07:00
unclejack
79b92f27aa
bump Go to 1.3
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: d0a0e91f1f8c3a43f04e7a58e37498124b283594
Component: engine
2014-07-26 21:33:31 +03:00
Tibor Vass
7e29f226f3
Kill all concurrent jobs on error
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 4cfe806db2a41a97079a4881d4a0099a7b5b8149
Component: engine
2014-07-26 13:45:35 -04:00
Solomon Hykes
Erik Hollensbe
Vishnu Kannan
hollietealok
Tibor Vass
Tianon Gravi
Victor Vieux
James Turnbull
unclejack
Sven Dowideit
knappe
Vincent Batts
Jan Toebes
Michael Crosby
unclejack
r0n22
Sébastien Luttringer
Francisco Carriedo