From 27a74cdddff6becda21e07b245c1c64c680cbaf2 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Sun, 10 Nov 2013 21:48:42 -0500 Subject: [PATCH] Move licensing information to LICENSE file --- LICENSE | 11 +++++++++++ README.md | 4 ++++ attributes/default.rb | 19 ------------------- providers/container.rb | 19 ------------------- providers/image.rb | 19 ------------------- recipes/aufs.rb | 19 ------------------- recipes/binary.rb | 20 -------------------- recipes/default.rb | 19 ------------------- recipes/package.rb | 19 ------------------- recipes/source.rb | 19 ------------------- recipes/upstart.rb | 19 ------------------- resources/container.rb | 19 ------------------- resources/image.rb | 19 ------------------- 13 files changed, 15 insertions(+), 210 deletions(-) diff --git a/LICENSE b/LICENSE index e69de29bb2..51fca54c2a 100644 --- a/LICENSE +++ b/LICENSE @@ -0,0 +1,11 @@ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/README.md b/README.md index 3410faafdf..d8b7243c4d 100644 --- a/README.md +++ b/README.md @@ -197,3 +197,7 @@ Please use standard Github issues/pull requests and if possible, in combination ## Maintainers * Brian Flad () + +## License + +Please see licensing information in: [LICENSE](LICENSE) diff --git a/attributes/default.rb b/attributes/default.rb index b6467a377f..ca517b7dd4 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Attributes:: default -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - include_attribute 'golang' case node['kernel']['machine'] diff --git a/providers/container.rb b/providers/container.rb index cb8fea3f3e..5aeb8e6b03 100644 --- a/providers/container.rb +++ b/providers/container.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Provider:: container -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - require 'chef/mixin/shell_out' include Chef::Mixin::ShellOut diff --git a/providers/image.rb b/providers/image.rb index 619a497ee1..defe5f6f4e 100644 --- a/providers/image.rb +++ b/providers/image.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Provider:: image -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - require 'chef/mixin/shell_out' include Chef::Mixin::ShellOut diff --git a/recipes/aufs.rb b/recipes/aufs.rb index dad4d077ef..554998f104 100644 --- a/recipes/aufs.rb +++ b/recipes/aufs.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Recipe:: aufs -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - case node['platform'] when 'ubuntu' # diff --git a/recipes/binary.rb b/recipes/binary.rb index f16e50d45f..b77fbaf13d 100644 --- a/recipes/binary.rb +++ b/recipes/binary.rb @@ -1,23 +1,3 @@ -# -# Cookbook Name:: docker -# Recipe:: binary -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Download docker binary to cache remote_file "#{node['docker']['install_dir']}/docker" do source node['docker']['binary']['url'] owner 'root' diff --git a/recipes/default.rb b/recipes/default.rb index 060a0d2e50..6386100bfd 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Recipe:: default -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - include_recipe 'apt' if node['platform'] == 'ubuntu' package 'apt-transport-https' diff --git a/recipes/package.rb b/recipes/package.rb index f75fd2b299..3b8e9b847b 100644 --- a/recipes/package.rb +++ b/recipes/package.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Recipe:: package -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - case node['platform'] when 'ubuntu' apt_repository 'docker' do diff --git a/recipes/source.rb b/recipes/source.rb index 41e487e146..7835be69fb 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Recipe:: source -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - directory "#{node['go']['gopath']}/src/github.com/dotcloud" do owner 'root' group 'root' diff --git a/recipes/upstart.rb b/recipes/upstart.rb index 4050fccc85..1c251c5711 100644 --- a/recipes/upstart.rb +++ b/recipes/upstart.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Recipe:: upstart -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - template '/etc/init/docker.conf' do source 'docker.conf.erb' mode '0600' diff --git a/resources/container.rb b/resources/container.rb index 5063bbd5cd..befff3cc4d 100644 --- a/resources/container.rb +++ b/resources/container.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Resource:: container -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - actions :remove, :restart, :run, :start, :stop default_action :run diff --git a/resources/image.rb b/resources/image.rb index b27dbca044..eb601febed 100644 --- a/resources/image.rb +++ b/resources/image.rb @@ -1,22 +1,3 @@ -# -# Cookbook Name:: docker -# Resource:: image -# -# Copyright 2013, Brian Flad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - actions :pull, :remove, :build, :import default_action :pull