4b29aba42a
Remove unneeded sqlite deps from puppet and debian control
...
Upstream-commit: 5dc1e66366d3a40169eec67d823f2d6209ba5b99
Component: engine
2013-03-28 18:38:53 -04:00
338903c9fa
Remove /usr/local/bin/docker
...
Upstream-commit: fa89076673bd734cebff88717bf79461ecf8d505
Component: engine
2013-03-28 05:28:11 +00:00
73606e3c52
vagrant: Simplify provisioning to build from repo
...
This sets up an idiomatic Go workspace in /opt/go with the source
shared from the host directory in
/opt/go/src/github.com/dotcloud/docker and docker installed into
/opt/go
Upstream-commit: a3ab89df2b3d9ba654ba85af5d71d063d401f23f
Component: engine
2013-03-27 21:55:25 -04:00
4862ca70d4
Fix Rackspace cloud user, remove dupe /home/vagrant definition
...
Upstream-commit: 5bec4b8f040f366a5a1eed294d98e383d64b46e7
Component: engine
2013-03-27 01:41:06 +00:00
8493716682
Remove duplicate user definition
...
Upstream-commit: 2b7284db4f4c5b311eadd0432577bf0c263c2cce
Component: engine
2013-03-27 01:20:45 +00:00
55fc055158
Merge remote-tracking branch 'upstream/master' into vagrant11-providers
...
Conflicts:
puppet/modules/docker/manifests/init.pp
Upstream-commit: 2b090320beae64e1bf15102da5dfe96937a21a77
Component: engine
2013-03-27 01:09:22 +00:00
438324da8d
Fix issue where Vagrant AWS deploys outside of my dev account would fail
...
Upstream-commit: afdf29e57fe2213698645298c2381cab27baadc0
Component: engine
2013-03-26 21:21:54 +00:00
b8061a28b7
Fix missing group "Vagrant" error
...
Upstream-commit: 94b9ca988de6970406789759b5f75fee19fd5dbb
Component: engine
2013-03-24 10:49:16 +00:00
21b7825620
Merge remote-tracking branch 'amesserl/raxcloud-support'
...
Conflicts:
Vagrantfile
Upstream-commit: bea7894166ad879a290650f8fa1ab06f9ca3cdb5
Component: engine
2013-03-24 10:16:50 +00:00
1de3f6e3ae
Adding support for the Rackspace Open Cloud
...
Upstream-commit: 95ad9e457388472e2c7f8175e0bf5444ba02a76a
Component: engine
2013-03-22 11:30:54 -05:00
01713ad972
Redirecting docker daemon stdout/stderr to /var/log/dockerd
...
Upstream-commit: cff01ec5ec3210f2faec3715bf1b07182bcc571c
Component: engine
2013-03-22 10:30:47 -05:00
84b60cc354
Waiting to start docker until the fresh binaries have been copied in
...
Upstream-commit: 9542876d2f22e73a52b4957d1a8ca6b17d5c83e7
Component: engine
2013-03-22 08:48:50 -05:00
6069c4c381
Add AWS support for running Docker on AWS
...
Upstream-commit: 8c83484bf26c54273bdaf080ebaf0428b04ec003
Component: engine
2013-03-15 04:22:07 +00:00
0ca923a8f8
puppet fixes for recent vagrant changes
...
Upstream-commit: fde01381d57d322a6112edfce7df21f13047290e
Component: engine
2013-03-13 13:31:23 -07:00
fa69063302
updated Vagrant to support new single binary, and exposing the vagrant shared folder, and setting some ENV variables
...
Upstream-commit: d479efc01ead3da7b57c85a493f957e46c5fa0d1
Component: engine
2013-03-13 13:30:13 -07:00
a31b72360d
upgraded kernel to 3.5.0-25 to fix a kernel bug
...
Upstream-commit: 94baf2c5b9b2eb49b554d933f9997da072905d88
Component: engine
2013-03-12 12:05:04 -07:00
46579cb546
changed the docker version in vagrant to pull down latest version, moved some things around and put docker and dockerd into /usr/local/bin now. Also added git to install package list
...
Upstream-commit: d4da0a0ddbb3ec1979941bc3d2425aab3a6b3f19
Component: engine
2013-03-11 17:48:39 -07:00
ae1dbfa7df
added a fix to the upstart command that wasn't setting hte LOCALE correctly, which was causing issues with UTF-8 bundles
...
Upstream-commit: 43875a73a0c2ee51f8bcd36634bbf64d836df6f8
Component: engine
2013-03-11 17:47:28 -07:00
58a8b7bd53
Update puppet/modules/docker/manifests/init.pp
...
Add required bsdtar dependency
Upstream-commit: ed85cb6508854f6d12d43e8a88a8c728bc633c3c
Component: engine
2013-02-26 18:17:51 -08:00
bf8488f9ea
vagrant: Changed the test image path
...
Upstream-commit: c696eb8d125528207522d1bbd06082aae9a8d494
Component: engine
2013-02-15 12:19:50 -08:00
72b568ab19
dropbox .tar.gz is now a gzip format file for real so change tar flag from j to z
...
Upstream-commit: 4355675d0c26b483f40295c0f335b528586adb96
Component: engine
2013-02-04 16:30:20 -08:00
7517727152
initial Vagrant & Puppet setup under Quantal64.
...
Upstream-commit: 814bb505ca5c713941d710566d85294962605317
Component: engine
2013-02-03 22:02:41 -08:00
