7cc5673df7
new Dockerfile keyword: 'push'
...
Upstream-commit: 40ccf1d30039a7ee975ddb2fc8aa989b1fa680fc
Component: engine
2013-05-01 00:42:11 -07:00
8fa50ab35a
docker-build: added support for 'maintainer' keyword
...
Upstream-commit: 038ca5ee392b974b1ace08d0a6359b02006e6aac
Component: engine
2013-05-01 00:14:52 -07:00
6179f6bbff
Merge pull request #485 from brunoqc/patch-1
...
* Packaging: connect to Ubuntu key server on port 80
Upstream-commit: 957c500ac9054067ace52530c282495cd56b3701
Component: engine
2013-04-30 15:46:57 -07:00
4dabc1b080
Merge pull request #488 from tobert/cgroups-via-proc-mounts
...
* runtime: Use /proc/mounts instead of mount(8)
Upstream-commit: 62a595da5c5518e0b6618c9608e07602b934b42a
Component: engine
2013-04-30 14:39:14 -07:00
5f6bf28c14
Improve crashTest
...
Upstream-commit: d97661aa715321a017190bd24870473ac6df34a3
Component: engine
2013-04-30 11:16:26 -07:00
500a2c5aa9
Use /proc/mounts instead of mount(8)
...
Specifically, Ubuntu Precise's cgroup-lite script uses mount -n
to mount the cgroup filesystems so they don't appear in mtab, so
detection always fails unless the admin updates mtab with /proc/mounts.
/proc/mounts is valid on just about every Linux machine in existence and
as a bonus is much easier to parse.
I also removed the regex in favor of a more accurate parser that should
also support monolitic cgroup mounts (e.g. mount -t cgroup none /cgroup).
Upstream-commit: c6119da33925fccf6af3f232f7aa7c75de41493b
Component: engine
2013-04-30 17:37:43 +00:00
a0f6e6e3a7
Use the 80 port with keyserver.ubuntu.com
...
Use the 80 port with keyserver.ubuntu.com so it works with corporate firewalls
Upstream-commit: 5051c20833cd3310d27564fe20f856f7e77b92f3
Component: engine
2013-04-29 15:53:50 -03:00
89bd2e658f
Improve crashTest
...
Upstream-commit: cdc2657ee9bdb1464a17d9daecc0659297d0ee83
Component: engine
2013-04-28 07:10:58 -07:00
cba2c66321
Simplify the crashTest
...
Upstream-commit: 76a1a7cf5ba2d2db2c7e5873df529f3f956a2156
Component: engine
2013-04-28 06:23:02 -07:00
8f8a9ec275
add network endpoint for crashTest
...
Upstream-commit: 20c2a4f80f4171ffb59ea61bdcf57d8edc970fa8
Component: engine
2013-04-28 03:54:22 -07:00
d9ff34c9b9
Update the crashTest to have the dockerpath in env
...
Upstream-commit: ebe157ebb567965e05cca45a1221cd36ec48a052
Component: engine
2013-04-28 01:27:56 -07:00
eb1c306ba5
Use default mirror from debootstrap when not explicitly provided, and add better target directory naming
...
Upstream-commit: ab34115b42cbcb42cb91593601d6daff2c7f32ad
Component: engine
2013-04-28 13:38:26 -06:00
236d6db8f3
Improve mkimage-debian script to also tag using the release version number of the final image (6.0.7, 7.0, etc.)
...
This is as discussed on #447 .
Upstream-commit: 4b3354af3fa4cea59271ace7cc4d1d072312b688
Component: engine
2013-04-28 12:31:28 -06:00
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
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
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
8dd14227bf
don't fight the box kernel version, not worth it
...
Upstream-commit: 4db680fda47306586819a41b80a9a2f6a67f0eb9
Component: engine
2013-04-25 06:29:13 -06:00
73e8a87234
get aufs dependencies into vmware image
...
Upstream-commit: 9c7293508dd849bf9086b5095b7412214d56b801
Component: engine
2013-04-25 06:09:04 -06:00
876724f84b
vmware fusion provider config
...
Upstream-commit: 9d8743a7aed88083b1a7c24a1a684e7a79108c15
Component: engine
2013-04-25 05:59:31 -06:00
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
5b920253cc
Specify a different bridge for tests than for regular runtime
...
Upstream-commit: ee298d1420ea58cdafa788d63547dadab47ef76d
Component: engine
2013-04-24 17:43:41 -07:00
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
2bbe465e70
Bumped version to 0.2.0
...
Upstream-commit: 90668a8a997c5db27ffdcc25c7921c63526b62f4
Component: engine
2013-04-23 23:15:09 -07:00
71db175e3e
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: c7fd84b8a0bcfe70c3897e6611e6c59fd514d28f
Component: engine
2013-04-23 23:05:38 -07:00
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
9417414b7f
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 370fafacbfffefe92e48a354db1665400f3f7056
Component: engine
2013-04-23 22:57:50 -07:00
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
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
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
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
0fbc38af42
Fix 'make release RELEASE_VERSION=master'
...
Upstream-commit: 8b8c8bf7cb0ed782d727440a0f2c59d464971353
Component: engine
2013-04-23 18:50:53 -07:00
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
11495ebf7e
packaging-ubuntu: update maintainer documentation for changelog file
...
Upstream-commit: f744cfd5a75e3b1565740c2f266dbfdf7be8727a
Component: engine
2013-04-23 13:51:03 -07:00
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
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
