Skip to content

Commit

Permalink
Docker 0.10.0: Add support for --env-file to load environment variabl…
Browse files Browse the repository at this point in the history
…es from files, closes #119
  • Loading branch information
bflad committed Apr 13, 2014
1 parent 3694e3d commit a12c58f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Attributes now available for all docker daemon flags as well as system IP forwar
* REMOVED: container_dns* attributes (use replacement dns* attributes on daemon for all containers or docker_container dns* attributes instead)
* DEPRECATED: bind_* attributes to match docker terminology (use host attribute instead)
* Enhancement: [#115][]: Add IP forwarding attributes
* Enhancement: [#119][]: Docker 0.10.0: Add support for --env-file to load environment variables from files
* Enhancement: [#124][]: Add all docker daemon options as attributes
* Enhancement: [#125][]: Use dns* attributes to set docker daemon options, not defaults per-container
* Enhancement: [#128][]: Add checksum attribute for binary downloads
Expand Down Expand Up @@ -445,6 +446,7 @@ Lots of community contributions this release -- thanks!
[#112]: https://github.com/bflad/chef-docker/issues/112
[#113]: https://github.com/bflad/chef-docker/issues/113
[#115]: https://github.com/bflad/chef-docker/issues/115
[#119]: https://github.com/bflad/chef-docker/issues/119
[#124]: https://github.com/bflad/chef-docker/issues/124
[#125]: https://github.com/bflad/chef-docker/issues/125
[#126]: https://github.com/bflad/chef-docker/issues/126
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ dns | DNS servers for container | String, Array | nil
dns_search | DNS search domains for container | String, Array | nil
entrypoint | Overwrite the default entrypoint set by the image | String | nil
env | Environment variables to pass to container | String, Array | nil
env_file | Read in a line delimited file of ENV variables | String | nil
expose | Expose a port from the container without publishing it to your host | Fixnum, String, Array | nil
hostname | Container hostname | String | nil
image | Image for container | String | LWRP name
Expand Down
1 change: 1 addition & 0 deletions providers/container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ def run
'dns' => Array(new_resource.dns),
'dns-search' => Array(new_resource.dns_search),
'env' => Array(new_resource.env),
'env-file' => new_resource.env_file,
'entrypoint' => new_resource.entrypoint,
'expose' => Array(new_resource.expose),
'hostname' => new_resource.hostname,
Expand Down
1 change: 1 addition & 0 deletions resources/container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
attribute :dns_search, :kind_of => [String, Array]
attribute :entrypoint, :kind_of => [String]
attribute :env, :kind_of => [String, Array]
attribute :env_file, :kind_of => [String]
attribute :expose, :kind_of => [Fixnum, String, Array]
attribute :force, :kind_of => [TrueClass, FalseClass], :default => false
attribute :hostname, :kind_of => [String]
Expand Down

0 comments on commit a12c58f

Please sign in to comment.