@@ -1,73 +1,57 @@

-PKG_NAME=lxc-docker

-PKG_ARCH=amd64

-PKG_VERSION=1

-ROOT_PATH:=$(PWD)

-BUILD_PATH=build	# Do not change, decided by dpkg-buildpackage

-BUILD_SRC=build_src

-GITHUB_PATH=src/github.com/dotcloud/docker

-INSDIR=usr/bin

-SOURCE_PACKAGE=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz

-DEB_PACKAGE=$(PKG_NAME)_$(PKG_VERSION)_$(PKG_ARCH).deb

-EXTRA_GO_PKG=./auth

-

-TMPDIR=$(shell mktemp -d -t XXXXXX)

+# Ubuntu package Makefile

+#

+# Dependencies:  debhelper autotools-dev devscripts golang

+# Notes:

+# Use 'make ubuntu' to create the ubuntu package

+# GPG_KEY environment variable needs to contain a GPG private key for package to be signed

+# and uploaded to docker PPA.

+# If GPG_KEY is not defined, make ubuntu will create docker package and exit with

+# status code 2

+PKG_NAME=lxc-docker

+VERSION=$(shell head -1 changelog | sed 's/^.\+(\(.\+\)..).\+$$/\1/')

+GITHUB_PATH=github.com/dotcloud/docker

+DOCKER_VERSION=${PKG_NAME}_${VERSION}

+DOCKER_FVERSION=${PKG_NAME}_$(shell head -1 changelog | sed 's/^.\+(\(.\+\)).\+$$/\1/')

+BUILD_SRC=${CURDIR}/../../build_src

-# Build a debian source package

-all: clean build_in_deb

-

-build_in_deb:

-	echo "GOPATH = " $(ROOT_PATH)

-	mkdir bin

-	cd $(GITHUB_PATH)/docker; GOPATH=$(ROOT_PATH) go build -o $(ROOT_PATH)/bin/docker

+all:

+	# Compile docker. Used by dpkg-buildpackage.

+	cd src/${GITHUB_PATH}/docker; GOPATH=${CURDIR} go build

-# DESTDIR provided by Debian packaging

 install:

-	# Call this from a go environment (as packaged for deb source package)

-	mkdir -p $(DESTDIR)/$(INSDIR)

-	mkdir -p $(DESTDIR)/etc/init

-	install -m 0755 bin/docker $(DESTDIR)/$(INSDIR)

-	install -o root -m 0755 etc/docker.upstart $(DESTDIR)/etc/init/docker.conf

-

-$(BUILD_SRC): clean

-	# Copy ourselves into $BUILD_SRC to comply with unusual golang constraints

-	tar --exclude=*.tar.gz --exclude=checkout.tgz -f checkout.tgz -cz *

-	mkdir -p $(BUILD_SRC)/$(GITHUB_PATH)

-	tar -f checkout.tgz -C $(BUILD_SRC)/$(GITHUB_PATH) -xz

-	cd $(BUILD_SRC)/$(GITHUB_PATH)/docker; GOPATH=$(ROOT_PATH)/$(BUILD_SRC) go get -d

-	for d in `find $(BUILD_SRC) -name '.git*'`; do rm -rf $$d; done

-	# Populate source build with debian stuff

-	cp -R -L ./deb/* $(BUILD_SRC)

-

-$(SOURCE_PACKAGE): $(BUILD_SRC)

-	rm -f $(SOURCE_PACKAGE)

-	# Create the debian source package

-	tar -f $(SOURCE_PACKAGE) -C ${ROOT_PATH}/${BUILD_SRC} -cz .

-

-# Build deb package fetching go dependencies and cleaning up git repositories

-deb: $(DEB_PACKAGE)

-

-$(DEB_PACKAGE): $(SOURCE_PACKAGE)

-	# dpkg-buildpackage looks for source package tarball in ../

-	cd $(BUILD_SRC); dpkg-buildpackage

-	rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files

-

-debsrc: $(SOURCE_PACKAGE)

-

-# Build local sources

-#$(PKG_NAME): build_local

-

-build_local:

-	-@mkdir -p bin

-	cd docker && go build -o ../bin/docker

-

-gotest:

-	@echo "\033[36m[Testing]\033[00m docker..."

-	@sudo -E GOPATH=$(ROOT_PATH)/$(BUILD_SRC) go test -v . $(EXTRA_GO_PKG) && \

-		echo -n "\033[32m[OK]\033[00m" || \

-		echo -n "\033[31m[FAIL]\033[00m"; \

-		echo " docker"

-	@sudo rm -rf /tmp/docker-*

-

-clean:

-	rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz bin

+	# Used by dpkg-buildpackage

+	mkdir -p ${DESTDIR}/usr/bin

+	mkdir -p ${DESTDIR}/etc/init

+	install -m 0755 src/${GITHUB_PATH}/docker/docker ${DESTDIR}/usr/bin

+	install -o root -m 0755 debian/docker.upstart ${DESTDIR}/etc/init/docker.conf

+

+ubuntu:

+	# This Makefile will compile the github master branch of dotcloud/docker

+	# Retrieve docker project and its go structure from internet

+	rm -rf ${BUILD_SRC}

+	GOPATH=${BUILD_SRC} go get ${GITHUB_PATH}

+	# Add debianization

+	mkdir ${BUILD_SRC}/debian

+	cp Makefile ${BUILD_SRC}

+	cp -r * ${BUILD_SRC}/debian

+	cp ../../README.md ${BUILD_SRC}

+	# Cleanup

+	for d in `find ${BUILD_SRC} -name '.git*'`; do rm -rf $$d; done

+	rm -rf ${BUILD_SRC}/../${DOCKER_VERSION}.orig.tar.gz

+	rm -rf ${BUILD_SRC}/pkg

+	# Create docker debian files

+	cd ${BUILD_SRC}; tar czf ../${DOCKER_VERSION}.orig.tar.gz .

+	cd ${BUILD_SRC}; dpkg-buildpackage -us -uc

+	rm -rf ${BUILD_SRC}

+	# Sign package and upload it to PPA if GPG_KEY environment variable

+	# holds a private GPG KEY

+	if /usr/bin/test "$${GPG_KEY}" == ""; then exit 2; fi

+	mkdir ${BUILD_SRC}

+	# Import gpg signing key

+	echo "$${GPG_KEY}" | gpg --allow-secret-key-import --import

+	# Sign the package

+	cd ${BUILD_SRC}; dpkg-source -x ${BUILD_SRC}/../${DOCKER_FVERSION}.dsc

+	cd ${BUILD_SRC}/${PKG_NAME}-${VERSION}; debuild -S -sa

+	cd ${BUILD_SRC};dput ppa:dotcloud/lxc-docker ${DOCKER_FVERSION}_source.changes

+	rm -rf ${BUILD_SRC}

new file mode 100644

@@ -0,0 +1,37 @@

+Docker on Ubuntu

+================

+

+The easiest way to get docker up and running natively on Ubuntu is installing

+it from its official PPA::

+

+  sudo sh -c "echo 'deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main' >>/etc/apt/sources.list"

+  sudo apt-get update

+  sudo apt-get install lxc-docker

+

+

+Building docker package

+~~~~~~~~~~~~~~~~~~~~~~~

+

+The building process is shared by both, developers and maintainers. If you are

+a developer, the Makefile will stop with exit status 2 right before signing

+the built packages.

+

+Assuming you are working on an Ubuntu 12.04 TLS system ::

+

+  # Download a fresh copy of the docker project

+  git clone https://github.com/dotcloud/docker.git

+  cd docker

+

+  # Get building dependencies

+  sudo apt-get update; sudo apt-get install -y debhelper autotools-dev devscripts golang

+

+  # Make the ubuntu package

+  (cd packaging/ubuntu; make ubuntu)

+

+

+Install docker built package

+~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+::

+

+  sudo dpkg -i lxc-docker_*_amd64.deb; sudo apt-get install -f -y

new file mode 100644

@@ -0,0 +1,12 @@

+BUILDBOT_IP = '192.168.33.32'

+

+Vagrant::Config.run do |config|

+  config.vm.box = 'quantal64_3.5.0-25'

+  config.vm.box_url = 'http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box'

+  config.vm.share_folder 'v-data', '/data/docker', "#{File.dirname(__FILE__)}/../.."

+  config.vm.network :hostonly,BUILDBOT_IP

+

+  # Install ubuntu packaging dependencies and create ubuntu packages

+  config.vm.provision :shell, :inline => 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -qq -y debhelper autotools-dev devscripts golang'

+  config.vm.provision :shell, :inline => "export GPG_KEY='#{ENV['GPG_KEY']}'; cd /data/docker/packaging/ubuntu; make ubuntu"

+end

@@ -1,4 +1,21 @@

-lxc-docker (1) precise; urgency=low

+lxc-docker (0.1.4.1-1) precise; urgency=low

+

+  Improvements [+], Updates [*], Bug fixes [-]:

+  * Test PPA

+

+ -- dotCloud <ops@dotcloud.com>  Fri, 15 Apr 2013 12:14:50 -0700

+

+

+lxc-docker (0.1.4-1) precise; urgency=low

+

+  Improvements [+], Updates [*], Bug fixes [-]:

+  * Changed default bridge interface do 'docker0'

+  - Fix a race condition when running the port allocator

+

+ -- dotCloud <ops@dotcloud.com>  Fri, 12 Apr 2013 12:20:06 -0700

+

+

+lxc-docker (0.1.0-1) unstable; urgency=low

   * Initial release

@@ -1,19 +1,19 @@

 Source: lxc-docker

 Section: misc

 Priority: extra

-Homepage: http://docker.io

 Maintainer: Daniel Mizyrycki <daniel@dotcloud.com>

-Build-Depends: debhelper (>= 8.0.0), pkg-config, git, golang, libsqlite3-dev

-Vcs-Git: http://github.com/dotcloud/docker.git

+Build-Depends: debhelper,autotools-dev,devscripts,golang

 Standards-Version: 3.9.3

+Homepage: http://github.com/dotcloud/docker

 Package: lxc-docker

-Architecture: amd64

-Depends: ${shlibs:Depends}, ${misc:Depends}, lxc, wget, bsdtar, curl, sqlite3

+Architecture: linux-any

+Depends: ${misc:Depends},${shlibs:Depends},lxc,bsdtar

 Conflicts: docker

-Description: A process manager with superpowers

-    It encapsulates heterogeneous payloads in Standard Containers, and runs

-    them on any server with strong guarantees of isolation and repeatability.

-    Is is a great building block for automating distributed systems:

-    large-scale web deployments, database clusters, continuous deployment

-    systems, private PaaS, service-oriented architectures, etc.

+Description: lxc-docker is a Linux container runtime

+ Docker complements LXC with a high-level API which operates at the process

+ level. It runs unix processes with strong guarantees of isolation and

+ repeatability across servers.

+ Docker is a great building block for automating distributed systems:

+ large-scale web deployments, database clusters, continuous deployment systems,

+ private PaaS, service-oriented architectures, etc.

@@ -1,209 +1,237 @@

-Format: http://dep.debian.net/deps/dep5

+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

 Upstream-Name: docker

-Source: https://github.com/dotcloud/docker

+Upstream-Contact: DotCloud Inc <opensource@dotcloud.com>

+Source: http://github.com/dotcloud/docker

 Files: *

-Copyright: 2012 DotCloud Inc (opensource@dotcloud.com)

-License: Apache License Version 2.0

-

-                                Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!) The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright 2012 DotCloud Inc (opensource@dotcloud.com)

-

-   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.

+Copyright: 2012, DotCloud Inc <opensource@dotcloud.com>

+License: Apache-2.0

+ Apache License

+ Version 2.0, January 2004

+ http://www.apache.org/licenses/

+ 

+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+ 

+ 1. Definitions.

+ 

+ "License" shall mean the terms and conditions for use, reproduction,

+ and distribution as defined by Sections 1 through 9 of this document.

+ 

+ "Licensor" shall mean the copyright owner or entity authorized by

+ the copyright owner that is granting the License.

+ 

+ "Legal Entity" shall mean the union of the acting entity and all

+ other entities that control, are controlled by, or are under common

+ control with that entity. For the purposes of this definition,

+ "control" means (i) the power, direct or indirect, to cause the

+ direction or management of such entity, whether by contract or

+ otherwise, or (ii) ownership of fifty percent (50%) or more of the

+ outstanding shares, or (iii) beneficial ownership of such entity.

+ 

+ "You" (or "Your") shall mean an individual or Legal Entity

+ exercising permissions granted by this License.

+ 

+ "Source" form shall mean the preferred form for making modifications,

+ including but not limited to software source code, documentation

+ source, and configuration files.

+ 

+ "Object" form shall mean any form resulting from mechanical

+ transformation or translation of a Source form, including but

+ not limited to compiled object code, generated documentation,

+ and conversions to other media types.

+ 

+ "Work" shall mean the work of authorship, whether in Source or

+ Object form, made available under the License, as indicated by a

+ copyright notice that is included in or attached to the work

+ (an example is provided in the Appendix below).

+ 

+ "Derivative Works" shall mean any work, whether in Source or Object

+ form, that is based on (or derived from) the Work and for which the

+ editorial revisions, annotations, elaborations, or other modifications

+ represent, as a whole, an original work of authorship. For the purposes

+ of this License, Derivative Works shall not include works that remain

+ separable from, or merely link (or bind by name) to the interfaces of,

+ the Work and Derivative Works thereof.

+ 

+ "Contribution" shall mean any work of authorship, including

+ the original version of the Work and any modifications or additions

+ to that Work or Derivative Works thereof, that is intentionally

+ submitted to Licensor for inclusion in the Work by the copyright owner

+ or by an individual or Legal Entity authorized to submit on behalf of

+ the copyright owner. For the purposes of this definition, "submitted"

+ means any form of electronic, verbal, or written communication sent

+ to the Licensor or its representatives, including but not limited to

+ communication on electronic mailing lists, source code control systems,

+ and issue tracking systems that are managed by, or on behalf of, the

+ Licensor for the purpose of discussing and improving the Work, but

+ excluding communication that is conspicuously marked or otherwise

+ designated in writing by the copyright owner as "Not a Contribution."

+ 

+ "Contributor" shall mean Licensor and any individual or Legal Entity

+ on behalf of whom a Contribution has been received by Licensor and

+ subsequently incorporated within the Work.

+ 

+ 2. Grant of Copyright License. Subject to the terms and conditions of

+ this License, each Contributor hereby grants to You a perpetual,

+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+ copyright license to reproduce, prepare Derivative Works of,

+ publicly display, publicly perform, sublicense, and distribute the

+ Work and such Derivative Works in Source or Object form.

+ 

+ 3. Grant of Patent License. Subject to the terms and conditions of

+ this License, each Contributor hereby grants to You a perpetual,

+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+ (except as stated in this section) patent license to make, have made,

+ use, offer to sell, sell, import, and otherwise transfer the Work,

+ where such license applies only to those patent claims licensable

+ by such Contributor that are necessarily infringed by their

+ Contribution(s) alone or by combination of their Contribution(s)

+ with the Work to which such Contribution(s) was submitted. If You

+ institute patent litigation against any entity (including a

+ cross-claim or counterclaim in a lawsuit) alleging that the Work

+ or a Contribution incorporated within the Work constitutes direct

+ or contributory patent infringement, then any patent licenses

+ granted to You under this License for that Work shall terminate

+ as of the date such litigation is filed.

+ 

+ 4. Redistribution. You may reproduce and distribute copies of the

+ Work or Derivative Works thereof in any medium, with or without

+ modifications, and in Source or Object form, provided that You

+ meet the following conditions:

+ 

+ (a) You must give any other recipients of the Work or

+ Derivative Works a copy of this License; and

+ 

+ (b) You must cause any modified files to carry prominent notices

+ stating that You changed the files; and

+ 

+ (c) You must retain, in the Source form of any Derivative Works

+ that You distribute, all copyright, patent, trademark, and

+ attribution notices from the Source form of the Work,

+ excluding those notices that do not pertain to any part of

+ the Derivative Works; and

+ 

+ (d) If the Work includes a "NOTICE" text file as part of its

+ distribution, then any Derivative Works that You distribute must

+ include a readable copy of the attribution notices contained

+ within such NOTICE file, excluding those notices that do not

+ pertain to any part of the Derivative Works, in at least one

+ of the following places: within a NOTICE text file distributed

+ as part of the Derivative Works; within the Source form or

+ documentation, if provided along with the Derivative Works; or,

+ within a display generated by the Derivative Works, if and

+ wherever such third-party notices normally appear. The contents

+ of the NOTICE file are for informational purposes only and

+ do not modify the License. You may add Your own attribution

+ notices within Derivative Works that You distribute, alongside

+ or as an addendum to the NOTICE text from the Work, provided

+ that such additional attribution notices cannot be construed

+ as modifying the License.

+ 

+ You may add Your own copyright statement to Your modifications and

+ may provide additional or different license terms and conditions

+ for use, reproduction, or distribution of Your modifications, or

+ for any such Derivative Works as a whole, provided Your use,

+ reproduction, and distribution of the Work otherwise complies with

+ the conditions stated in this License.

+ 

+ 5. Submission of Contributions. Unless You explicitly state otherwise,

+ any Contribution intentionally submitted for inclusion in the Work

+ by You to the Licensor shall be under the terms and conditions of

+ this License, without any additional terms or conditions.

+ Notwithstanding the above, nothing herein shall supersede or modify

+ the terms of any separate license agreement you may have executed

+ with Licensor regarding such Contributions.

+ 

+ 6. Trademarks. This License does not grant permission to use the trade

+ names, trademarks, service marks, or product names of the Licensor,

+ except as required for reasonable and customary use in describing the

+ origin of the Work and reproducing the content of the NOTICE file.

+ 

+ 7. Disclaimer of Warranty. Unless required by applicable law or

+ agreed to in writing, Licensor provides the Work (and each

+ Contributor provides its Contributions) on an "AS IS" BASIS,

+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+ implied, including, without limitation, any warranties or conditions

+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

+ PARTICULAR PURPOSE. You are solely responsible for determining the

+ appropriateness of using or redistributing the Work and assume any

+ risks associated with Your exercise of permissions under this License.

+ 

+ 8. Limitation of Liability. In no event and under no legal theory,

+ whether in tort (including negligence), contract, or otherwise,

+ unless required by applicable law (such as deliberate and grossly

+ negligent acts) or agreed to in writing, shall any Contributor be

+ liable to You for damages, including any direct, indirect, special,

+ incidental, or consequential damages of any character arising as a

+ result of this License or out of the use or inability to use the

+ Work (including but not limited to damages for loss of goodwill,

+ work stoppage, computer failure or malfunction, or any and all

+ other commercial damages or losses), even if such Contributor

+ has been advised of the possibility of such damages.

+ 

+ 9. Accepting Warranty or Additional Liability. While redistributing

+ the Work or Derivative Works thereof, You may choose to offer,

+ and charge a fee for, acceptance of support, warranty, indemnity,

+ or other liability obligations and/or rights consistent with this

+ License. However, in accepting such obligations, You may act only

+ on Your own behalf and on Your sole responsibility, not on behalf

+ of any other Contributor, and only if You agree to indemnify,

+ defend, and hold each Contributor harmless for any liability

+ incurred by, or claims asserted against, such Contributor by reason

+ of your accepting any such warranty or additional liability.

+ 

+ END OF TERMS AND CONDITIONS

+ 

+ APPENDIX: How to apply the Apache License to your work.

+ 

+ To apply the Apache License to your work, attach the following

+ boilerplate notice, with the fields enclosed by brackets "[]"

+ replaced with your own identifying information. (Don't include

+ the brackets!) The text should be enclosed in the appropriate

+ comment syntax for the file format. We also recommend that a

+ file or class name and description of purpose be included on the

+ same "printed page" as the copyright notice for easier

+ identification within third-party archives.

+ 

+ Copyright 2012 DotCloud Inc

+ 

+ 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.

+ 

+ 

+Files: src/github.com/kr/pty/*

+Copyright: Copyright (c) 2011 Keith Rarick

+License: Expat

+ Copyright (c) 2011 Keith Rarick

+ 

+ Permission is hereby granted, free of charge, to any person

+ obtaining a copy of this software and associated

+ documentation files (the "Software"), to deal in the

+ Software without restriction, including without limitation

+ the rights to use, copy, modify, merge, publish, distribute,

+ sublicense, and/or sell copies of the Software, and to

+ permit persons to whom the Software is furnished to do so,

+ subject to the following conditions:

+ 

+ The above copyright notice and this permission notice shall

+ be included in all copies or substantial portions of the

+ Software.

+ 

+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY

+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE

+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

+ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS

+ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

@@ -5,6 +5,6 @@ stop on starting rc RUNLEVEL=[016]

 respawn

 script

-    test -f /etc/default/locale && . /etc/default/locale || true

+    /usr/bin/test -f /etc/default/locale && . /etc/default/locale || true

     LANG=$LANG LC_ALL=$LANG /usr/bin/docker -d

 end script

new file mode 100644

@@ -0,0 +1,4 @@

+#!/bin/sh

+

+# Start docker

+/sbin/start docker

new file mode 100644

@@ -0,0 +1,4 @@

+#!/bin/sh

+

+# Stop docker

+/sbin/stop docker

new file mode 100644

@@ -0,0 +1,34 @@

+Maintainer duty

+===============

+

+Ubuntu allows developers to use their PPA (Personal Package Archive)

+repository. This is very convenient for the users as they just need to add

+the PPA address, update their package database and use the apt-get tool.

+

+The official lxc-docker package is located on launchpad and can be accessed

+adding the following line to /etc/apt/sources.list ::

+

+  deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main

+

+

+Realeasing a new package

+~~~~~~~~~~~~~~~~~~~~~~~~

+

+The most relevant information to update is the changelog file:

+Each new release should create a new first paragraph with new release version,

+changes, and the maintainer information.

+

+Assuming your PPA GPG signing key is on /media/usbdrive/docker.key, load it

+into the GPG_KEY environment variable with::

+

+  export GPG_KEY=`cat /media/usbdrive/docker.key`

+

+

+After this is done and you are ready to upload the package to the PPA, you have

+a couple of choices:

+

+* Follow README.debian to generate the actual source packages and upload them

+  to the PPA

+* Let vagrant do all the work for you::

+

+  ( cd docker/packaging/ubuntu; vagrant up )