Граф коммитов

180 Коммитов

Автор SHA1 Сообщение Дата
Gareth Rushgrove f95cd8e784 Merge pull request #49 from specialunderwear/lxc_conf_upstart
It would be nice if upstart users could also make use of the lxc_conf pa...
2014-03-22 10:44:51 +00:00
Lars van de Kerkhof a9a5cd3178 Added test for lxc_conf parameter 2014-03-20 16:35:43 +01:00
Lars van de Kerkhof c578f85fad Added tests for execdriver option. 2014-03-20 16:25:55 +01:00
Lars van de Kerkhof bfc42ef7d8 cleanup spaces 2014-03-19 17:29:36 +01:00
Lars van de Kerkhof 80f072b438 Use udef as default for execdriver because the -e option is not supported on all docker versions. 2014-03-19 17:15:56 +01:00
Lars van de Kerkhof 9a9f4e6537 Support exec driver option. 2014-03-19 17:12:04 +01:00
Lars van de Kerkhof b41af67cba params must come before image and command. 2014-03-19 16:59:36 +01:00
Lars van de Kerkhof 9ec15f4298 It would be nice if upstart users could also make use of the lxc_conf parameter. 2014-03-19 14:57:08 +01:00
Gareth Rushgrove 7a73ea325c Merge pull request #48 from Super-Visions/proxy_support
Proxy support
2014-03-14 16:02:43 +00:00
Christophe Fonteyne 29a4bb4ffa rspec tests for proxy and no_proxy parameters 2014-03-14 15:44:54 +01:00
Christophe Fonteyne 739d8956eb export env variables 2014-03-13 18:21:14 +01:00
Christophe Fonteyne eaf83c0ecf Typo in templates 2014-03-13 17:10:31 +01:00
Christophe Fonteyne 3fb95d318d Proxy and no_proxy support 2014-03-13 16:56:51 +01:00
Gareth Rushgrove a5391f2f32 fix cgroups for 0.9 release 2014-03-12 21:51:14 +00:00
Gareth Rushgrove e2742f6fcf Merge pull request #40 from netmanagers/master
Use upstart only on Ubuntu based distros
2014-03-05 17:25:27 +00:00
Gareth Rushgrove 8a04f4b620 Merge pull request #41 from welterde/feature-no_network
add disable_network to docker::run
2014-03-05 17:22:27 +00:00
Tassilo Schweyer b12aee236f add disable_network to docker::run 2014-03-04 15:24:17 +01:00
Javier Bértoli c4d302f6db Use upstart only on Ubuntu based distros 2014-03-04 07:43:57 -03:00
Gareth Rushgrove 1f09ade687 bump version number 2014-03-01 13:17:37 +00:00
Gareth Rushgrove 7d53ea284d Merge pull request #38 from rodjek/extra_parameters_ubuntu
Add support for $extra_parameters to Ubuntu upstart script
2014-03-01 10:08:17 +00:00
Tim Sharpe 0f262f56ee Add support for $extra_parameters to Ubuntu upstart script 2014-03-01 20:41:15 +11:00
Gareth Rushgrove 26d100b7d5 Fix for issue #39
Minimal Ubuntu installs require a separate package to use https for
apt repos, which the docker image uses
2014-03-01 09:22:05 +00:00
Gareth Rushgrove 5405f65fe6 The latest apt module requires lsbdistid in the facts list
See this commit and comments for details:
f6816c6bb3
2014-03-01 09:13:27 +00:00
Gareth Rushgrove d791aa13df update dependencies for developmet 2014-03-01 09:13:16 +00:00
Gareth Rushgrove 6e0ce4a1b6 typo in class name in comments 2014-02-21 15:18:28 +00:00
Gareth Rushgrove 366b3da080 Merge pull request #35 from billsimon/master
Add parameter to enable/disable Docker start on boot
2014-02-12 15:59:02 +00:00
Bill Simon b501e78107 Added tests for service_enable parameter and added param to RedHat 2014-02-12 09:01:45 -05:00
Bill Simon b96087aeb2 Add parameter to enable/disable Docker start on boot 2014-02-09 20:43:51 -05:00
Gareth Rushgrove aa45098680 Merge pull request #33 from ISEexchange/style
support consistent coding style across users
2014-01-26 14:00:36 -08:00
Paul Morgan 3144ab09e2 support consistent coding style across users
If the user adds an editorconfig plugin to their editor or IDE,
editorconfig auto-applies the correct coding style.
2014-01-23 19:15:57 +00:00
Gareth Rushgrove 3dc170b323 [blacksmith] Bump version 2014-01-21 23:16:21 +00:00
Gareth Rushgrove 0ab9b277f4 bump version 2014-01-21 23:15:59 +00:00
Gareth Rushgrove de0889f663 Merge pull request #31 from jumanjiman/travis
align travis test matrix with puppetlabs platform support matrix
2014-01-20 08:38:32 -08:00
Paul Morgan cfa9285233 git ignores .bundle/
.bundle is not in upstream, so presumably
it's not part of any workflow.
2014-01-20 15:54:52 +00:00
Paul Morgan 5296c57541 travis test matrix excludes rvm 1.9.3 when puppet < 3.0
http://docs.puppetlabs.com/guides/platforms.html#ruby-versions
asserts that Puppet older than 3.0 do not support Ruby 1.9.3

After this commit, the travis test matrix aligns with
the PuppetLabs platform support matrix as currently published.
2014-01-20 15:54:51 +00:00
Paul Morgan b3f0ee44b7 travis test matrix includes rvm 2.0.0 when puppet >= 3.2
Puppet 3.2 and higher are supported on Ruby 2.x according to
http://docs.puppetlabs.com/guides/platforms.html#ruby-versions
so it makes sense to test this module on the same matrix.

Exclude older versions of Puppet from the test matrix
under rvm 2.0.0 because older versions of Puppet definitely
fail on rvm 2.0.0.
2014-01-20 15:54:51 +00:00
Paul Morgan 352bffcdc2 remove matrix tag from travis env yaml
"matrix" doesn't belong in env param according to
http://docs.travis-ci.com/user/build-configuration/#The-Build-Matrix

Although it works as-is, having matrix under env prevents exclusions
from working.
2014-01-20 15:51:27 +00:00
Gareth Rushgrove bb9b60575e Merge pull request #30 from jumanjiman/epel
allow to suppress epel on red hat distros
2014-01-20 06:44:54 -08:00
Paul Morgan e79ed8f72f allow to suppress epel on red hat distros
The `use_upstream_package_source` parameter already allows
apt users to suppress upstream repos. After this commit,
the param also applies to red hat and centos users.

New unit tests:

    docker
      if running on a RedHat based distro
        by default
          should contain Class[epel]
        with no upstream package source
          should not contain Class[epel]
      with no upstream package source
        should not contain Class[epel]
2014-01-19 22:19:31 +00:00
Gareth Rushgrove 64fa14a290 added serverspec in for nicer integration testing 2014-01-19 19:44:51 +00:00
Gareth Rushgrove 36f0e2b475 bump version number 2014-01-19 16:03:15 +00:00
Gareth Rushgrove 42ba14e728 updated docs with RedHat link 2014-01-19 15:26:46 +00:00
Gareth Rushgrove c76824cbbb added contributing guidelines 2014-01-19 15:26:27 +00:00
Gareth Rushgrove 49487ed143 remove unused logic 2014-01-19 15:24:05 +00:00
Gareth Rushgrove 8506b2d923 document recently added params 2014-01-19 15:00:04 +00:00
Gareth Rushgrove 216801314f add a bunch of RedHat specific tests 2014-01-19 13:44:46 +00:00
Gareth Rushgrove a2a75b14b5 missing file from RedHat support 2014-01-19 13:07:15 +00:00
Gareth Rushgrove f4a54c55cb Merge pull request #29 from garethr/ldx-upstreampr
Add support for RedHat based distros
2014-01-19 04:44:56 -08:00
Gareth Rushgrove 4798c58df2 add a centos 65 box to the integration tests 2014-01-19 12:35:04 +00:00
Gareth Rushgrove b1aafdf851 add epel to dependencies 2014-01-19 12:34:23 +00:00