3705ed705e
Clone LVM using https: instead of git:
...
The ports for the git protocol are not open in all corporate environments
Upstream-commit: ad23745456f9bb9c1c3da3796a2ab769f192bf36
Component: engine
2013-11-25 17:12:18 +00:00
cdb93a78ac
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
Upstream-commit: 2382a0f920f7473b2b2762d886470a417a5dbac7
Component: engine
2013-11-20 11:07:42 -08:00
56750f8076
Pip python deps to a specific version
...
Upstream-commit: 2cccbbdadd8ee7e28824c244e48acebfca96d78a
Component: engine
2013-11-19 19:25:54 -08:00
b6950e3878
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
2013-11-19 14:58:12 -08:00
6f7d08bf45
Update to go1.2rc5
...
Upstream-commit: 9e1da3ec9ce8e608c17d999446882ae096b8394f
Component: engine
2013-11-17 22:36:26 -07:00
7686e1f389
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
2013-11-14 14:02:44 -08:00
c52a89950a
Update to go1.2rc4
...
Upstream-commit: 8523d5518c500903c19a53f73c653318e4db38f9
Component: engine
2013-11-12 21:51:12 -07:00
c471d2b756
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
2013-11-07 23:26:52 +00:00
8d563825a1
Bump Dockerfile to go1.2rc3
...
Upstream-commit: fcc0ac61093d0cd0b49b11bb5f7f7501e070bd63
Component: engine
2013-11-04 21:12:18 -07:00
2e3d85e90f
Add libdevmapper static compilation to Dockerfile for device-mapper
...
Upstream-commit: d11f75b5050944e373125008be1c9683797c72a9
Component: engine
2013-11-04 16:11:33 -07:00
57c35f0f44
Update Dockerfile to consistently use tabs as the command argument separator
...
Upstream-commit: 24dd838aeefcf4ea1f5a950a9fe0af075f00e2bf
Component: engine
2013-11-04 15:39:16 -07:00
5e4f415366
Refactor HostConfig and escape apparmor confinement
...
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
5b0bbe7633
remove docker ls and add docker link in usage and switch to go1.2rc2
...
Upstream-commit: 6c863b49ef9de8f203c84f7e2e55f33deeb10bdb
Component: engine
2013-10-25 15:13:25 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
8846d6c443
Update Dockerfile test comment
...
Upstream-commit: ee7d9b0bdec40d02ba5ef25f557cca9444a19669
Component: engine
2013-10-16 00:31:34 +00:00
67ef149cd9
Fixed broken tests
...
Some tests failed because the `auplink` binary was not found inside of the
"docker" container.
Upstream-commit: ca56b35e5334d9f6a6741830951eb1535ca6f9b2
Component: engine
2013-10-15 11:44:56 +02:00
33aa0c2b85
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
...
Upstream-commit: ccefe47897bdcef8b56bf54d4bd324989855f3b5
Component: engine
2013-09-30 13:57:30 -06:00
b6370d00a5
Hack: use vendored dependencies in-place, for less moving parts when developing
...
Upstream-commit: e37dcd726fe415193eaed18729251d293a018909
Component: engine
2013-09-09 15:05:25 -07:00
9327ca0955
move deps installation to vendor.sh script
...
Upstream-commit: 20d24a450cbf22b6d5268bc1fe76022fa554d6be
Component: engine
2013-09-07 17:35:48 -07:00
970480b8f8
Document using the Dockerfile for interactive dev/test cycles
...
Upstream-commit: d757bd0904b71346b6c83622ae5685bc0c0d4349
Component: engine
2013-09-06 20:16:13 -07:00
742fb66041
Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS.
...
Upstream-commit: 47838051be695a4e74c80690ceef811dcd3ef62c
Component: engine
2013-09-06 20:14:03 -07:00
4d40f8afe3
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
...
Upstream-commit: fa806f26aff927eb0d98b41e79786ae98987da5b
Component: engine
2013-09-06 19:58:05 -07:00
c090718b10
Adapt Dockerfile to run docker tests inside docker
...
Upstream-commit: 34eab428330ce4a56c22b03f3067dd8eeee7ed41
Component: engine
2013-09-06 19:27:49 -07:00
0a02121daf
Update tar pkg revision number
...
Upstream-commit: ea813d8593d30e430ce05597becb1e394cb72a25
Component: engine
2013-09-03 18:30:32 +00:00
61822e5ae3
use libffi-dev, don't build it from sources
...
Upstream-commit: 72cfa3de3584d8cade530360e0e5997a06981e7a
Component: engine
2013-08-23 19:13:30 +03:00
33dccc4da2
Removed duplicate mercurial install command
...
Upstream-commit: 2191419f4cb5c452b02102a37d154fee6ca536e3
Component: engine
2013-08-22 23:12:28 +01:00
8da97a2aaa
Moved release scripts to hack/release and updated instructions.
...
Upstream-commit: b5a48eaed34b81253334575fccf5cb6f1b01fc61
Component: engine
2013-08-20 19:36:06 -07:00
2d055ce58a
Implement apt-secure repository signing.
...
Upstream-commit: 9c06420b1876a58d2cd6ea38e5c5139ca42061fe
Component: engine
2013-08-20 19:35:31 -07:00
20d1f9978e
Update to go 1.1.2.
...
Upstream-commit: abfa7a204de9c21ee722a45de51ebae4c004e07e
Component: engine
2013-08-20 19:35:30 -07:00
fe0392c5a2
Install python-magic (it helps s3cmd) and a convenience /src symlink
...
Upstream-commit: 9694fb85d791376dc05849f607883f50a6c79f7d
Component: engine
2013-08-20 19:35:30 -07:00
1a991a16ad
Running the build image will now execute release.sh automatically.
...
Upstream-commit: fbd5b20c388f189ffd59da78951bfc0c623de856
Component: engine
2013-08-20 19:35:30 -07:00
31b53c5f9b
Protect the release.sh script against accidental use. Infer VERSION automatically.
...
Upstream-commit: ff30eb96b67a0ab078553a769456bf6669a29214
Component: engine
2013-08-20 19:35:30 -07:00
611ecad7e3
Upgrade Dockerfile with new dependency
...
Upstream-commit: bdbac9f7a1dd31bd5d78f50eb9fa3b3793d1d13b
Component: engine
2013-08-20 19:35:30 -07:00
4299704169
Good-bye, ugly mega-Makefile. Docker can now be built with docker, with the help of a simple very simple shell script.
...
Upstream-commit: 89ee5242291c50402973ffb73fe1dbbf5820e44c
Component: engine
2013-08-20 19:34:10 -07:00
7aa32c3271
Merge pull request #1509 from dotcloud/1359-tar-pkg-ref
...
Add import for dotcloud/tar to replace std tar pkg
Upstream-commit: 25d71fb01b1ffce2e6704e0c9c1bb2c80ca6053f
Component: engine
2013-08-14 11:26:49 -07:00
a74f9e3dd3
Add import for dotcloud/tar to replace std tar pkg
...
Upstream-commit: ec61c46bf73b8c727fe8de1982d86a1417a8a0c4
Component: engine
2013-08-12 22:42:29 +00:00
c5aa8d03ec
Install websocket library before building docker
...
Upstream-commit: def9598ed968eac934699db1b8717f852652b1ef
Component: engine
2013-08-12 05:22:33 +01:00
f46f2cd5f6
* Hack: standardized docker's build environment in a Dockerfile
...
Upstream-commit: 9f1fc40a64fd6863dec5298099041493fee87db5
Component: engine
2013-07-08 21:30:29 -07:00
