docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
1,111 Commits 12 Branches 297 Tags
91fa0f0669af3b83189c89a44bf42499956b9ca3
Commit Graph

1111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume J. Charmes
91fa0f0669 Move the capabilities detection into a runtime method 
Upstream-commit: 9042535f5af607f2362fa3f995427e1c5aab664e
Component: engine
 2013-04-26 14:32:55 -07:00
Guillaume J. Charmes
eb3034a4cf Merge pull request #473 from dotcloud/26-auto_restart_containers-feature 
+ runtime: Add -r flag to dockerd in order to restart previously running container....
Upstream-commit: 8f81e175af419e5669fd8b74958b0ea85d8cc248
Component: engine
 2013-04-26 14:02:01 -07:00
Guillaume J. Charmes
79019a5e64 Merge pull request #467 from dotcloud/improve_localhost_port_test 
* tests: Improve unit test to avoid unnecessary warnigns
Upstream-commit: 636c7835d3a94996918ec4f1412fc13c83ffc6ba
Component: engine
 2013-04-26 14:01:13 -07:00
Guillaume J. Charmes
99df381d5a Merge pull request #478 from tianon/mkimage-debian 
+ contrib: Add contrib/mkimage-debian.sh used to create the tianon/debian images
Upstream-commit: 6d1dd8b41a4cd7630a27c26508d7fa298b401184
Component: engine
 2013-04-26 13:51:47 -07:00
Tianon Gravi
c2191051d8 Add contrib/mkimage-debian.sh used to create the tianon/debian images 
Upstream-commit: 86ad98e72aa764a236984b3cc4ab8d59071b876a
Component: engine
 2013-04-26 08:54:29 -06:00
Solomon Hykes
c249b82cb8 Merge pull request #474 from brianm/vmware_fusion_provider 
Support for VMWare Fusion Provider in Vagrantfile
Upstream-commit: 03d82922aa742b465e4f21c9ddec79ef4266e6a6
Component: engine
 2013-04-26 01:31:11 -07:00
Brian McCallister
8dd14227bf don't fight the box kernel version, not worth it 
Upstream-commit: 4db680fda47306586819a41b80a9a2f6a67f0eb9
Component: engine
 2013-04-25 06:29:13 -06:00
Brian McCallister
73e8a87234 get aufs dependencies into vmware image 
Upstream-commit: 9c7293508dd849bf9086b5095b7412214d56b801
Component: engine
 2013-04-25 06:09:04 -06:00
Brian McCallister
876724f84b vmware fusion provider config 
Upstream-commit: 9d8743a7aed88083b1a7c24a1a684e7a79108c15
Component: engine
 2013-04-25 05:59:31 -06:00
Guillaume J. Charmes
85eee11a06 Add -r flag to dockerd in order to restart previously running container. Fixes #26 
Upstream-commit: 50144aeb42283848db730b936d6b5b6332ec6565
Component: engine
 2013-04-24 19:01:23 -07:00
Guillaume J. Charmes
5b920253cc Specify a different bridge for tests than for regular runtime 
Upstream-commit: ee298d1420ea58cdafa788d63547dadab47ef76d
Component: engine
 2013-04-24 17:43:41 -07:00
Solomon Hykes
3f0eb64040 Merge pull request #466 from dotcloud/441-vagrant-improve 
* Packaging: simplify Vagrantfile
Upstream-commit: 03855b0027fa782070c30eb11a8ca7c36df4a66a
Component: engine
 2013-04-24 17:25:20 -07:00
Daniel Mizyrycki
d5b0d2fd8e vagrant; issue #441: Improve main config including aws ubuntu lts dependency 
Upstream-commit: 2726e3649a204d15dcf79d2709e6457b6ca50c14
Component: engine
 2013-04-24 11:30:15 -07:00
Solomon Hykes
2bbe465e70 Bumped version to 0.2.0 
Upstream-commit: 90668a8a997c5db27ffdcc25c7921c63526b62f4
Component: engine
 2013-04-23 23:15:09 -07:00
Solomon Hykes
71db175e3e Merge branch 'master' of ssh://github.com/dotcloud/docker 
Upstream-commit: c7fd84b8a0bcfe70c3897e6611e6c59fd514d28f
Component: engine
 2013-04-23 23:05:38 -07:00
Solomon Hykes
771ccdd366 - Dev: dockerbuilder requires a fake initctl because 'apt-get install devscripts' insists on installing a stupid daemon I never asked for in the first place. 
Upstream-commit: 874a40ed3a8a6cf5711ac377712c189e0761c706
Component: engine
 2013-04-23 23:04:54 -07:00
Solomon Hykes
9417414b7f Merge branch 'master' of ssh://github.com/dotcloud/docker 
Upstream-commit: 370fafacbfffefe92e48a354db1665400f3f7056
Component: engine
 2013-04-23 22:57:50 -07:00
Solomon Hykes
6c4341a951 dockerbuilder: upload most recent Ubuntu package (note version FOO might not yet be packaged at tag vFOO) 
Upstream-commit: a0478f726d8751f37e4e20e3cc5e858bfc111180
Component: engine
 2013-04-23 22:57:34 -07:00
Solomon Hykes
1d1c2c4078 Merge pull request #427 from dhrp/docs 
- Packaging: Fixed Vagrantfile
* Documentation: Updated install instructions
Upstream-commit: e5bc5a2e317de0e5c8a061d600b88116617c34f6
Component: engine
 2013-04-23 19:49:28 -07:00
Solomon Hykes
a2804cedc1 Merge pull request #470 from dotcloud/packaging-ubuntu 
* Packaging: Add 0.1.8 to Ubuntu packaging changelog
* Packaging: Update the Ubuntu maintainer manual
Upstream-commit: 25fc3a7e76a13aa810b7c91fbb3a606329fd7fb7
Component: engine
 2013-04-23 19:46:56 -07:00
Solomon Hykes
f829dbfdd6 Makefile improvements 
+ Convenience rules: srcrelease, deps
	- Separate dependency vendoring from building the binary
	  (re-download dependencies with 'make deps')
Upstream-commit: b3ab0b561ed6dd06a569fa800109d18070886149
Component: engine
 2013-04-23 19:41:38 -07:00
Solomon Hykes
0fbc38af42 Fix 'make release RELEASE_VERSION=master' 
Upstream-commit: 8b8c8bf7cb0ed782d727440a0f2c59d464971353
Component: engine
 2013-04-23 18:50:53 -07:00
Solomon Hykes
8d65f94e38 make release: build a binary release of the most recent version tag 
Upstream-commit: a8651a23b2cca4c9a9dcc3a6829e9496d68ddef5
Component: engine
 2013-04-23 18:32:59 -07:00
Daniel Mizyrycki
11495ebf7e packaging-ubuntu: update maintainer documentation for changelog file 
Upstream-commit: f744cfd5a75e3b1565740c2f266dbfdf7be8727a
Component: engine
 2013-04-23 13:51:03 -07:00
Solomon Hykes
580d68b08c dockerbuilder: build with 'make; cp -R ./bin' 
Upstream-commit: e03b241fb18fa5dab4ec94c3d86eacb21601ac66
Component: engine
 2013-04-23 12:07:54 -07:00
Thatcher Peskens
5cff06982a Fixed remaining issues and conflicts created by last merge. 
Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae
Component: engine
 2013-04-23 12:04:53 -07:00
Solomon Hykes
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
Guillaume J. Charmes
7dad97c027 Remove unecessary memeory limit within tests 
Upstream-commit: 6ebb2491314afb3be4b0b82d14ddba743ec460de
Component: engine
 2013-04-23 11:25:16 -07:00
Guillaume J. Charmes
7a87a87114 Improve TestMultipleAttachRestart to avoid unnecessary warning 
Upstream-commit: c45beabcd54090bcb31eaa7a5af5878262b7b0e5
Component: engine
 2013-04-23 11:22:30 -07:00
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Solomon Hykes
fd63b71156 dockerbuilder: build in current directory instead /go and /tmp 
Upstream-commit: 7577f48dc441d14cb600b799498f29f9b4639ffe
Component: engine
 2013-04-23 10:53:02 -07:00
Solomon Hykes
9091b2150c dockerbuilder: /usr/local/bin is already set by docker 
Upstream-commit: 0512cf9c839be2c5370830cb80bcbec400273eac
Component: engine
 2013-04-23 10:49:58 -07:00
Solomon Hykes
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
Solomon Hykes
af7d46bbb8 Merge pull request #465 from shamrin/patch-2 
- Documentation: fixed typo in "Building blocks"
Upstream-commit: 50f5723f1d21c41fd25549567013a3ba06e888b4
Component: engine
 2013-04-23 09:02:19 -07:00
Alexey Shamrin
7f9b606ce0 fixed typo in buildingblocks.rst 
Upstream-commit: cbc4eccd50ac80ff6e21caeb386328f8a5fcfaff
Component: engine
 2013-04-23 12:52:55 +04:00
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
f62367f034 Completed Changelog for all past versions 
Upstream-commit: 4f6cc5c7330a7389d558dece2e432f13249bd565
Component: engine
 2013-04-23 00:30:18 -07:00
Tianon Gravi
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
Solomon Hykes
55a64b53cc - Runtime: ghost containers can be killed. 
Upstream-commit: 95e066d24fc4d9248e5e98f6d8ce018764834547
Component: engine
 2013-04-22 22:30:33 -07:00
Solomon Hykes
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
Solomon Hykes
e294fd1dc7 Bumped version to 0.1.8 
Upstream-commit: 97badbd29e15296b2b4cb55b01246f658c5e9de6
Component: engine
 2013-04-22 22:04:57 -07:00
Thatcher Peskens
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
Thatcher Peskens
5e92f87f4e Merged changes 
Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242
Component: engine
 2013-04-22 18:38:42 -07:00
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
56cb20082e Make kernel detection work without suffix 
Upstream-commit: c05c91ca3bb69d2c9faa0a2b15bc23b7c2a7bd8a
Component: engine
 2013-04-22 18:15:33 -07:00
Guillaume J. Charmes
51acd7e848 Forbid attach to ghost 
Upstream-commit: b76d63cb0c97aacec6d81c07108d2a573fb8af05
Component: engine
 2013-04-22 17:53:32 -07:00