docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
4,692 Commits 12 Branches 296 Tags
121a1998ccb8acb241eb20d52f94de947674d596
Commit Graph

48 Commits

Author SHA1 Message Date
Frederik Loeffert
002c9db825 Vagrantfile modified to support VBoxGuestAdditions_4.3.2 
Upstream-commit: 7e580aacec10d64c2fa0811e41a35159e47fcfa4
Component: engine
 2013-11-17 01:20:21 +01:00
Galen Sampson
ab0419261e Vagrantfile updates. 
- Remove the overrides config.vm.box and config.vm.box_url and use
  the same values for all providers.
- Use the same private key path for all providers.  It is still possible
  to set a different private key path through the environment variable
  SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
  Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
  instance type of instead of hard coding the AWS instance type as
  't1.micro'.  't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
  API tools.  This allows people who already have the EC2 tools set up
  correctly to use 'vagrant up' with less environment configuration
  than before.
- Rewrite the provisioning code.  The goal is to be idempotent and to
  correctly install docker for all providers instead of just virtualbox.
  It will conditionally install the virtualbox guest additions if
  virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
Upstream-commit: ccbb5d34927dc1905984bead3ebb576c0ea20960
Component: engine
 2013-11-10 23:39:26 -08:00
Daniel Mizyrycki
daf88bbd0c Merge pull request #1813 from doubleyou/patch-1 
Improve network performance for VirtualBox
Upstream-commit: 6d6097cddf19494acc86347b992be8e77fe5d317
Component: engine
 2013-10-11 16:23:19 -07:00
Tianon Gravi
6443c6c995 Add vagrant user to the docker group 
Upstream-commit: d62df6b2b587fce29eec769ab60efb81cf4062b5
Component: engine
 2013-10-11 11:00:04 -06:00
Jonathan Mueller
f59e96fe69 Enable SSH Agent forwarding in Vagrant VM, so one is able to clone repos from private git repos etc. 
Upstream-commit: 8f5c33dc1f923bb8478524be4f10581685e5d359
Component: engine
 2013-09-25 22:57:04 +02:00
Dmitry Demeshchuk
8fddc1cc80 Improve network performance for VirtualBox 
Without those lines, VitrualBox machines are being very slow with all network operations (tested only in OS X Lion, but they are supposed to work everywhere). See https://github.com/mitchellh/vagrant/issues/1807
Upstream-commit: e5239b98598ece4287c1088e95a2eaed585d2da4
Component: engine
 2013-09-05 21:05:23 -07:00
Daniel Mizyrycki
f646963f0f deployment, issue #1578: Avoid pinning kernel headers. Add Vagrantfile assumptions 
Upstream-commit: 8878943ac9ab3b3344d398b45e68ebb7cea879f0
Component: engine
 2013-09-04 14:41:09 -07:00
Jimmy Cuadra
1cee01680e Don't install VirtualBox Guest Additions if VAGRANT_DEFAULT_PROVIDER is set. 
Upstream-commit: 28e75b23b39aa0aee951378bf1039886c00f7783
Component: engine
 2013-09-04 11:21:24 -07:00
Daniel Mizyrycki
61c8f585f5 deployment, issue #1787: Remove deprecated port forwarding from /Vagrantfile 
Upstream-commit: 34145f9840b62de85d385a65702f054962878cae
Component: engine
 2013-09-04 10:05:54 -07:00
Daniel Mizyrycki
200311a8e1 Merge pull request #1449 from spkane/honor-ENV-VAGRANT_DEFAULT_PROVIDER 
Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools
Upstream-commit: a0a5170991fa92f03f3a01477d69fcbb435b1ea2
Component: engine
 2013-09-03 17:38:03 -07:00
Daniel Mizyrycki
c7a7785d65 pr #1718: Fetch docker gpg over https 
Upstream-commit: 91ee67954961e9f8e5b4827022c2a3aee7997253
Component: engine
 2013-09-03 17:14:49 -07:00
Markus Fix
65eaa57cc6 Changed docker apt repo URI from https to http because the http driver for apt is not installed by default 
Upstream-commit: 52fe45249798991a35f5a5b5a4e1af26ea42221c
Component: engine
 2013-09-03 17:10:03 -07:00
Shih-Yuan Lee (FourDollars)
0489287cce Install Ubuntu raring backported kernel from official archives directly. 
Upstream-commit: 6c206f7d7835310c39ef20d3375e949b1fbfd7b9
Component: engine
 2013-08-30 14:12:13 +08:00
Kawsar Saiyeed
9da6e68e41 Update Vagrantfile to use docker apt repository 
Upstream-commit: 1f85ed6825c07a9c2a86f995b2db484953ee1e6e
Component: engine
 2013-08-24 16:49:55 +01:00
Sean P. Kane
89a694fd4b Assume that if VAGRANT_DEFAULT_PROVIDER is set we shouldn't install vbox tools 
Upstream-commit: 0e21de9a25edfe56fa996055712d25b7a3345f0d
Component: engine
 2013-08-07 09:38:49 -07:00
Manuel Meurer
f5e3a27080 Fix indentation in Vagrantfile 
Upstream-commit: b9149f45bf6bdef3b7025fe7c94a930696a4b4ab
Component: engine
 2013-08-06 15:21:26 +02:00
Jonathan Rudenberg
48643d0043 Revert "Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304" 
This reverts commit bdc79ac8b2dfad302f9e144711067a566726cfa2.
Upstream-commit: 07fee445593982ef9063a184c05ba93ecacd2e65
Component: engine
 2013-08-02 19:18:02 -03:00
Jonathan Rudenberg
b0bd5c4e73 Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304 
Upstream-commit: bdc79ac8b2dfad302f9e144711067a566726cfa2
Component: engine
 2013-07-26 15:45:00 -04:00
Sam J Sharpe
dfa9579ca2 Vagrantfile: Add support for VMWare Fusion provider 
As a user who has blown $150 on VMWare Fusion and vagrant-vmware, I
would like to use my new shiny to hack on Docker. Docker already has a
multi-provider Vagrantfile, so adding another one presents little risk.

Known Issues:

- The docker install of a new kernel breaks the Vagrant shared folder.
    - This seems to be because the VMWare hgfs module doesn't build
      against a 3.8 kernel.
    - I don't believe that shared folder support is actually in use
Upstream-commit: 8281a0fa1cea0199ab183c0925a41e79a18382dc
Component: engine
 2013-06-18 06:19:14 +01:00
Guillaume J. Charmes
280d969b39 Merge pull request #857 from edx/856-vagrant-port-forwarding 
* Vagrantfile: Add an option to forward all ports to the vagrant host that have been ex...
Upstream-commit: f413fb8e56ae42a762222ddcf402cbaf89878e2e
Component: engine
 2013-06-14 14:37:55 -07:00
Calen Pennington
c81b1a9b04 Add an option to forward all ports to the vagrant host that have been exported from docker containers 
Upstream-commit: 302660e362ba36f9966b9a70b7d7284b94afb89d
Component: engine
 2013-06-07 15:56:39 -04:00
Victor Vieux
62817c64ab add 4243 port forward 
Upstream-commit: c75942c79da708a350c4a9cf32a5f06f8ca1ab7c
Component: engine
 2013-05-15 02:41:19 +02:00
Thomas Bikeev
1a8a87ec92 Made AWS region and ami to be configurable through the ENV variables. 
Upstream-commit: 9cfcfbae522eac5b771babf017d1d4b2ceb5d249
Component: engine
 2013-05-11 19:27:42 +02:00
Daniel Mizyrycki
0948379fc8 packaging-ubuntu; issue #516: Add xorg kernel to Vagrantfile for stable ubuntu LTS docker distro 
Upstream-commit: 73321f27f4518fca83f6707da947e0811b39795a
Component: engine
 2013-05-08 19:36:06 -07:00
Dr Nic Williams
87d18405c3 Allow reuse of existing vagrant boxes by env variables 
Usage:

    BOX_NAME=precise64 vagrant up
Upstream-commit: 04f41ebdbca8969a97cd5366fbf55e1a5d521ead
Component: engine
 2013-05-03 15:35:51 -07:00
Bruno Bigras
755075c572 Use only one deb line in /etc/apt 
This prevents the script from filling up /etc/apt/sources.list with more than one deb line which cause a warning when updating.
Upstream-commit: 74cd7e822d4fbac96faab1173cf2fc4e95658901
Component: engine
 2013-05-02 13:33:23 -04:00
Daniel Mizyrycki
dc48c220f3 Fix main Vagrantfile 
Upstream-commit: 0d9475346f3548c525ecfbbd44c95a47a0013f0e
Component: engine
 2013-05-01 18:49:31 -07:00
Bruno Bigras
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
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
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
Thatcher Peskens
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
Thatcher Peskens
69774ce2e6 Updated documentation and fixed Vagrantfile 
Upstream-commit: 8ecde8f9a5dcad23afea013a62d373cef303fa84
Component: engine
 2013-04-19 20:57:50 -07:00
Jonathan Rudenberg
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
Nelson Chen
7930efd497 use the directory where the vagrantfile is located for mounting 
Upstream-commit: 43213dfc4a441ca347cd97ceca219e8e021f08ef
Component: engine
 2013-03-26 23:14:50 -07:00
Charles Hooper
3bf53727e0 Stop using custom AMI and use standard Ubuntu AMI 
Upstream-commit: 8461196a794d0ccd42b958fd93b833b7df9a8ca5
Component: engine
 2013-03-27 01:41:47 +00:00
Charles Hooper
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
Charles Hooper
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
Charles Hooper
6089bc44f0 Use new AMI that won't cause issues with cloud-init apply_creds 
Upstream-commit: 5cebc226cc0d734936a3d63e10027d46f39e8025
Component: engine
 2013-03-26 17:40:56 +00:00
Charles Hooper
21b7825620 Merge remote-tracking branch 'amesserl/raxcloud-support' 
Conflicts:
	Vagrantfile
Upstream-commit: bea7894166ad879a290650f8fa1ab06f9ca3cdb5
Component: engine
 2013-03-24 10:16:50 +00:00
Antony Messerli
1de3f6e3ae Adding support for the Rackspace Open Cloud 
Upstream-commit: 95ad9e457388472e2c7f8175e0bf5444ba02a76a
Component: engine
 2013-03-22 11:30:54 -05:00
Daniel Mizyrycki
9420f9fed2 vagrant; issue #113: normalize whitespaces 
Upstream-commit: 45df6f7801554ccb24ba8ccf42ec5a847262b9ca
Component: engine
 2013-03-21 22:26:18 -07:00
Daniel Mizyrycki
16a6ba544f vagrant; issue #113: Make Vagrantfile backward compatible with versions < 1.1 
Upstream-commit: 6295a022750627d433c5c44872393ede4f1d8051
Component: engine
 2013-03-21 22:16:52 -07:00
Charles Hooper
6069c4c381 Add AWS support for running Docker on AWS 
Upstream-commit: 8c83484bf26c54273bdaf080ebaf0428b04ec003
Component: engine
 2013-03-15 04:22:07 +00:00
Ken Cochrane
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
Ken Cochrane
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
Niall O'Higgins
7517727152 initial Vagrant & Puppet setup under Quantal64. 
Upstream-commit: 814bb505ca5c713941d710566d85294962605317
Component: engine
 2013-02-03 22:02:41 -08:00