580d68b08c
dockerbuilder: build with 'make; cp -R ./bin'
...
Upstream-commit: e03b241fb18fa5dab4ec94c3d86eacb21601ac66
Component: engine
2013-04-23 12:07:54 -07:00
5cff06982a
Fixed remaining issues and conflicts created by last merge.
...
Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae
Component: engine
2013-04-23 12:04:53 -07:00
2e5e342257
dockerbuilder: use a pristine GOPATH, with the fresh checkout registered at the right path (for internal submodules)
...
Upstream-commit: 2485bb2cd20a453c2c5f0fff3a6481ef539da591
Component: engine
2013-04-23 11:45:47 -07:00
7dad97c027
Remove unecessary memeory limit within tests
...
Upstream-commit: 6ebb2491314afb3be4b0b82d14ddba743ec460de
Component: engine
2013-04-23 11:25:16 -07:00
7a87a87114
Improve TestMultipleAttachRestart to avoid unnecessary warning
...
Upstream-commit: c45beabcd54090bcb31eaa7a5af5878262b7b0e5
Component: engine
2013-04-23 11:22:30 -07:00
27ad61c153
Wait for the container to finish in TestAttachDisconnect before destroying it
...
Upstream-commit: a22c78523f20c44e90e7a3adbd01a5560ed4f6ae
Component: engine
2013-04-23 11:09:48 -07:00
b74a205fb6
Make sure the container is well started prior to perform the test
...
Upstream-commit: 5a02c9ba0a8e4dc19001a11d00049ec2c76511f0
Component: engine
2013-04-23 11:08:31 -07:00
fd63b71156
dockerbuilder: build in current directory instead /go and /tmp
...
Upstream-commit: 7577f48dc441d14cb600b799498f29f9b4639ffe
Component: engine
2013-04-23 10:53:02 -07:00
9091b2150c
dockerbuilder: /usr/local/bin is already set by docker
...
Upstream-commit: 0512cf9c839be2c5370830cb80bcbec400273eac
Component: engine
2013-04-23 10:49:58 -07:00
f9222f5820
Increased timeout in TCP port allocation test to pass on slower machines
...
Upstream-commit: 73da7a12e7d6846a12571e6eac1f16502219c9d4
Component: engine
2013-04-23 10:12:46 -07:00
efa5049675
added run (wip), fixed ps and images, added port and tag
...
Upstream-commit: cf19be44a8eb9b790ba3bef29f851dc65cb61c3c
Component: engine
2013-04-23 18:20:53 +02:00
7f9b606ce0
fixed typo in buildingblocks.rst
...
Upstream-commit: cbc4eccd50ac80ff6e21caeb386328f8a5fcfaff
Component: engine
2013-04-23 12:52:55 +04:00
48b5752bf3
Merge pull request #464 from tianon/patch-1
...
- Runtime: adapt cgroup capability detection to work on Gentoo
Upstream-commit: cff26b3a6c56422b3f2a0275fa7ef1cdd187138b
Component: engine
2013-04-23 00:36:10 -07:00
c681f7de93
Merge pull request #462 from dotcloud/initial_changelog
...
+ Add initial Changelog
Upstream-commit: 329c3e0ffd1aac642556e1f8ab7df14ce05c4027
Component: engine
2013-04-23 00:32:25 -07:00
f62367f034
Completed Changelog for all past versions
...
Upstream-commit: 4f6cc5c7330a7389d558dece2e432f13249bd565
Component: engine
2013-04-23 00:30:18 -07:00
f318096044
Update FindCgroupMountpoint to be more forgiving
...
On Gentoo, the memory cgroup is mounted at /sys/fs/cgroup/memory, but the mount line looks like the following:
memory on /sys/fs/cgroup/memory type cgroup (rw,nosuid,nodev,noexec,relatime,memory)
(note that the first word on the line is "memory", not "cgroup", but the other essentials are there, namely the type of cgroup and the memory mount option)
Upstream-commit: e413340723871ad2d7a03822ca06993ee3c0a4bc
Component: engine
2013-04-23 01:09:29 -06:00
55a64b53cc
- Runtime: ghost containers can be killed.
...
Upstream-commit: 95e066d24fc4d9248e5e98f6d8ce018764834547
Component: engine
2013-04-22 22:30:33 -07:00
054b038e78
hack/dockerbuilder: a standard build environment for building and uploading official binary builds of docker... inside docker
...
Upstream-commit: 82b8f7a565ec1fdd82644ef715767ea93d95a0b0
Component: engine
2013-04-22 22:29:12 -07:00
e294fd1dc7
Bumped version to 0.1.8
...
Upstream-commit: 97badbd29e15296b2b4cb55b01246f658c5e9de6
Component: engine
2013-04-22 22:04:57 -07:00
28e13570bc
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Conflicts:
docker/docker.go
docs/sources/installation/archlinux.rst
docs/sources/installation/index.rst
docs/sources/installation/ubuntulinux.rst
runtime.go
utils.go
Upstream-commit: 5a5e417d46fe0bcac974e7180f50b0c59a8ec320
Component: engine
2013-04-22 18:44:50 -07:00
5e92f87f4e
Merged changes
...
Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242
Component: engine
2013-04-22 18:38:42 -07:00
2d0236d1b1
Merge pull request #463 from dotcloud/improve_pid_file_feature
...
Check that the pid in pidfile exists before preventing docker to start
Upstream-commit: 0b0d958b88db5de966652de50033e4653afb5a7c
Component: engine
2013-04-22 18:24:03 -07:00
e45cc3d0d4
Merge pull request #442 from dotcloud/fix_deleted_file_diff
...
Use aufs to handle parents whiteouts instead of doing it manually
Upstream-commit: 03e4704ae58cdd03eef23e873b5e0b964470001c
Component: engine
2013-04-22 18:23:46 -07:00
5b94f91912
Merge pull request #456 from dotcloud/453-generic_kernel_detection-fix
...
453 generic kernel detection fix
Upstream-commit: 7a8ac76299ffa2e9f9ae2a1f800a7e2234500012
Component: engine
2013-04-22 18:20:17 -07:00
56cb20082e
Make kernel detection work without suffix
...
Upstream-commit: c05c91ca3bb69d2c9faa0a2b15bc23b7c2a7bd8a
Component: engine
2013-04-22 18:15:33 -07:00
51acd7e848
Forbid attach to ghost
...
Upstream-commit: b76d63cb0c97aacec6d81c07108d2a573fb8af05
Component: engine
2013-04-22 17:53:32 -07:00
af6dece8d5
Allow to kill/stop ghosts
...
Upstream-commit: f926ed182f908aba20980202becfcdbe2d1e9c34
Component: engine
2013-04-22 17:53:32 -07:00
ffa41c520d
Allow to kill container after docker server restarts
...
Upstream-commit: d440782e17d384d52c813f93cd53d2d8a15fd13a
Component: engine
2013-04-22 17:52:38 -07:00
e0f172a6ff
Allow to wait on container even after docker server restarts using lxc-info
...
Upstream-commit: 82848d415866d08121bb52857e7d7b1d2a952c0c
Component: engine
2013-04-22 17:52:38 -07:00
9868eec5a4
Add unit test for file deletion
...
Upstream-commit: 97535e5a6466dcad6ed9767960e869eadf68204f
Component: engine
2013-04-22 17:51:09 -07:00
2a6be2d202
Check that the pid in pidfile exists before preventing docker to start
...
Upstream-commit: f079fbe3fa90d58d414341bed5246539c89b61b2
Component: engine
2013-04-22 15:57:31 -07:00
494b53d7fc
Merge pull request #457 from shamrin/patch-1
...
README.md: `docker port` instead of just `port`
Upstream-commit: 90d144b6120a7279b86382a74b6d2a9350a6b865
Component: engine
2013-04-22 15:40:03 -07:00
3c0fcda559
Fix typo (ghot -> ghost)
...
Upstream-commit: ffe16e32243da4f02d325dae1bf08f71181ed439
Component: engine
2013-04-22 18:37:06 -04:00
e065336209
Add initial changelog
...
Upstream-commit: 0b60829df795bc5178feb8f266b1f7e35a91f6da
Component: engine
2013-04-22 15:26:06 -07:00
ddf6d0da71
added push hijack (wip)
...
Upstream-commit: 6ce475dbdf97fd5e721a150c58d92d6819e5decb
Component: engine
2013-04-22 23:37:22 +02:00
80a0321a4f
Updated gettingstarted with quicker install.
...
Upstream-commit: 690e1186704eff65ff72404eb2a686b2b205ee7c
Component: engine
2013-04-22 13:36:00 -07:00
7793ea0a7b
README.md: docker port instead of just port
...
Upstream-commit: 038e1d174bed0d73bcf4ba197f60651907aa1116
Component: engine
2013-04-23 00:27:23 +04:00
469031c87e
Updated Vagrantfile and documentation to reflect new installation path using Ubuntu's PPA, also switched everything to use Ubuntu 12.04 by default.
...
Upstream-commit: 6c8dcd5cbbff2b33f878a32ae3b93abc0d7b9dae
Component: engine
2013-04-22 13:10:32 -07:00
6b46021e64
Move the kernel detection to arch specific files
...
Upstream-commit: 16aeb77d5155cf33d1637073b9ca56728d472b49
Component: engine
2013-04-22 12:08:59 -07:00
59824ca670
Make the kernel version detection more generic
...
Upstream-commit: 4ac3b803b9b7d0db1840a12f3332034938eb9550
Component: engine
2013-04-22 11:39:56 -07:00
14226bf464
Do not prevent docker from running when kernel detection fails
...
Upstream-commit: 3514e47edc2d3cdaae2d92a78cc5c618d9549f13
Component: engine
2013-04-22 11:26:34 -07:00
e2e7fde654
Fix race within TestRunDisconnectTty
...
Upstream-commit: acb546cd1bf45a248f4bb51637c795ef63feb6cb
Component: engine
2013-04-22 11:16:32 -07:00
5cb2c65d08
restify api
...
Upstream-commit: 1aa7f1392de665a6c8f751f53e1f7bb7bb6bf4f3
Component: engine
2013-04-22 18:17:47 +02:00
7f4ff6f610
Merge pull request #454 from tianon/master
...
Update utils.go to not enforce extra constraints on the kernel "flavor" (such as being integral or even comparable one to another)
Upstream-commit: 2ced94b41461a399bc848006901af5ab15d665c3
Component: engine
2013-04-22 08:02:42 -07:00
1e9641c3d7
Do not stop execution if cgroup mountpoint is not found
...
Upstream-commit: 71b580661451c35f01ee3824506f572c52d86ac8
Component: engine
2013-04-22 00:44:57 -04:00
547af82c3d
Update utils.go to not enforce extra constraints on the kernel "flavor" (such as being integral or even comparable one to another)
...
This is especially to fix the current docker on kernels such as gentoo-sources, where the "flavor" is the string "gentoo", and that obviously fails to be converted to an integer.
Upstream-commit: 1f65c6bf4c9dcfc513eeb9da34a7cac60c6bc4ff
Component: engine
2013-04-21 19:19:38 -06:00
262fafb31f
'docker push' shows an additional progress bar while it buffers the archive to disk. Fixes #451 .
...
Upstream-commit: 965e8a02d24a35aa7a7f64f2baf2b652a04f5983
Component: engine
2013-04-21 15:29:26 -07:00
41f179ebb1
'docker push' buffers filesystem archives on disk instead of memory.
...
Upstream-commit: baacae8345febd688579ac29832c200c41602ed2
Component: engine
2013-04-21 14:23:55 -07:00
53559b1043
Better title in ubuntu install doc
...
Upstream-commit: 52cedb8a05182c7d6f5e5918453cf356b1efafc8
Component: engine
2013-04-20 18:26:15 -07:00
81120bfb3a
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 15c7e72e2a518cb24b1f5bf9bb75fbfcdaccafc4
Component: engine
2013-04-20 18:19:04 -07:00
