Browse Source

Merge remote-tracking branch 'origin/packaging'

Solomon Hykes 12 years ago
parent
commit
db08705e3c

+ 0 - 1
deb/Makefile

@@ -1 +0,0 @@
-../Makefile

+ 0 - 1
deb/README.md

@@ -1 +0,0 @@
-../README.md

+ 0 - 5
deb/debian/changelog

@@ -1,5 +0,0 @@
-dotcloud-docker (1) precise; urgency=low
-
-  * Initial release
-
- -- dotCloud <ops@dotcloud.com>  Mon, 14 Mar 2013 04:43:21 -0700

+ 0 - 10
deb/etc/docker-dev.upstart

@@ -1,10 +0,0 @@
-description     "Run docker"
-
-start on runlevel [2345]
-stop on starting rc RUNLEVEL=[016]
-respawn
-
-script
-    test -f /etc/default/locale && . /etc/default/locale || true
-    LANG=$LANG LC_ALL=$LANG /usr/bin/docker -d
-end script

+ 8 - 0
packaging/README.rst

@@ -0,0 +1,8 @@
+Docker packaging
+================
+
+This directory has one subdirectory per packaging distribution.
+At minimum, each of these subdirectories should contain a
+README.$DISTRIBUTION explaining how to create the native
+docker package and how to install it.
+

+ 35 - 0
packaging/debian/Makefile

@@ -0,0 +1,35 @@
+PKG_NAME=lxc-docker
+DOCKER_VERSION=$(shell head -1 changelog | awk 'match($$0, /\(.+\)/) {print substr($$0, RSTART+1, RLENGTH-4)}')
+GITHUB_PATH=github.com/dotcloud/docker
+SOURCE_PKG=$(PKG_NAME)_$(DOCKER_VERSION).orig.tar.gz
+BUILD_SRC=${CURDIR}/../../build_src
+
+all:
+	# Compile docker. Used by debian dpkg-buildpackage. 
+	cd src/${GITHUB_PATH}/docker; GOPATH=${CURDIR} go build
+
+install:
+	# Used by debian dpkg-buildpackage 
+	mkdir -p $(DESTDIR)/usr/bin
+	mkdir -p $(DESTDIR)/etc/init.d
+	install -m 0755 src/${GITHUB_PATH}/docker/docker $(DESTDIR)/usr/bin
+	install -o root -m 0755 debian/docker.initd $(DESTDIR)/etc/init.d/docker
+
+debian:
+	# 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}/../${SOURCE_PKG}
+	rm -rf ${BUILD_SRC}/pkg
+	# Create docker debian files
+	cd ${BUILD_SRC}; tar czf ../${SOURCE_PKG} .
+	cd ${BUILD_SRC}; dpkg-buildpackage
+	rm -rf ${BUILD_SRC}

+ 31 - 0
packaging/debian/README.debian

@@ -0,0 +1,31 @@
+Docker on Debian
+================
+
+Docker has been built and tested on Wheezy. All docker functionality works
+out of the box, except for memory limitation as the stock debian kernel
+does not support it yet.
+
+
+Building docker package
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Building Dependencies: debhelper, autotools-dev and golang
+
+
+Assuming you have a wheezy system up and running
+
+# 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 golang
+
+# Make the debian package, with no memory limitation support
+(cd packaging/debian; make debian NO_MEMORY_LIMIT=1)
+
+
+Install docker package
+~~~~~~~~~~~~~~~~~~~~~~
+
+sudo dpkg -i lxc-docker_0.1.4-1_amd64.deb; sudo apt-get install -f -y

+ 22 - 0
packaging/debian/Vagrantfile

@@ -0,0 +1,22 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+$BUILDBOT_IP = '192.168.33.31'
+
+def v10(config)
+  config.vm.box = 'debian'
+  config.vm.share_folder 'v-data', '/data/docker', File.dirname(__FILE__) + '/../..'
+  config.vm.network :hostonly, $BUILDBOT_IP
+
+  # Install debian packaging dependencies and create debian packages
+  config.vm.provision :shell, :inline => 'apt-get -qq update; apt-get install -y debhelper autotools-dev golang'
+  config.vm.provision :shell, :inline => 'cd /data/docker/packaging/debian; make debian'
+end
+
+Vagrant::VERSION < '1.1.0' and Vagrant::Config.run do |config|
+  v10(config)
+end
+
+Vagrant::VERSION >= '1.1.0' and Vagrant.configure('1') do |config|
+  v10(config)
+end

+ 14 - 0
packaging/debian/changelog

@@ -0,0 +1,14 @@
+lxc-docker (0.1.4-1) unstable; urgency=low
+
+  Improvements [+], Updates [*], Bug fixes [-]:
+  * Changed default bridge interface do 'docker0'
+  - Fix a race condition when running the port allocator
+
+ -- Daniel Mizyrycki <daniel@dotcloud.com>  Wed, 10 Apr 2013 18:06:21 -0700
+
+
+lxc-docker (0.1.0-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Daniel Mizyrycki <daniel@dotcloud.com>  Mon, 29 Mar 2013 18:09:55 -0700

+ 1 - 0
packaging/debian/compat

@@ -0,0 +1 @@
+9

+ 19 - 0
packaging/debian/control

@@ -0,0 +1,19 @@
+Source: lxc-docker
+Section: admin
+Priority: optional
+Maintainer: Daniel Mizyrycki <daniel@dotcloud.com>
+Build-Depends: debhelper (>= 9),autotools-dev,golang
+Standards-Version: 3.9.3
+Homepage: http://github.com/dotcloud/docker
+
+Package: lxc-docker
+Architecture: linux-any
+Depends: ${misc:Depends},${shlibs:Depends},lxc,bsdtar
+Conflicts: docker
+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.

+ 237 - 0
packaging/debian/copyright

@@ -0,0 +1,237 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: docker
+Upstream-Contact: DotCloud Inc <opensource@dotcloud.com>
+Source: http://github.com/dotcloud/docker
+
+Files: *
+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.

+ 49 - 0
packaging/debian/docker.initd

@@ -0,0 +1,49 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          docker
+# Required-Start:    $local_fs
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: docker
+# Description:       docker daemon
+### END INIT INFO
+
+DOCKER=/usr/bin/docker
+PIDFILE=/var/run/docker.pid
+
+# Check docker is present
+[ -x $DOCKER ] || log_success_msg "Docker not present"
+
+# Get lsb functions
+. /lib/lsb/init-functions
+
+
+case "$1" in
+  start)
+    log_begin_msg "Starting docker..."
+    start-stop-daemon --start --background --exec "$DOCKER" -- -d
+    log_end_msg $?
+    ;;
+  stop)
+    log_begin_msg "Stopping docker..."
+    docker_pid=`pgrep -f "$DOCKER -d"`
+    [ -n "$docker_pid" ] && kill $docker_pid
+    log_end_msg $?
+    ;;
+  status)
+    docker_pid=`pgrep -f "$DOCKER -d"`
+    if [ -z "$docker_pid" ] ; then
+      echo "docker not running"
+    else
+      echo "docker running (pid $docker_pid)"
+    fi
+    ;;
+  *)
+    echo "Usage: /etc/init.d/docker {start|stop|status}"
+    exit 1
+    ;;
+esac
+
+exit 0

+ 0 - 0
deb/debian/docs → packaging/debian/docs


+ 13 - 0
packaging/debian/lxc-docker.postinst

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Ensure cgroup is mounted
+if [ -z "`/bin/egrep -e '^cgroup' /etc/fstab`" ]; then
+    /bin/echo 'cgroup  /sys/fs/cgroup  cgroup  defaults  0   0' >>/etc/fstab
+fi
+if [ -z "`/bin/mount | /bin/egrep -e '^cgroup'`" ]; then
+    /bin/mount /sys/fs/cgroup
+fi
+
+# Start docker
+/usr/sbin/update-rc.d docker defaults
+/etc/init.d/docker start

+ 16 - 0
packaging/debian/maintainer.rst

@@ -0,0 +1,16 @@
+Maintainer duty
+===============
+
+The Debian project specifies the role of a 'maintainer' which is the person
+making the Debian package of the program. This role requires an 'sponsor' to
+upload the package. As a maintainer you should follow the guide
+http://www.debian.org/doc/manuals/maint-guide . Your sponsor will be there
+helping you succeed.
+
+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.
+
+After this is done, follow README.debian to generate the actual source
+packages and talk with your sponsor to upload them into the official Debian
+package archive.

+ 13 - 0
packaging/debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh ${@} --with autotools_dev

+ 0 - 0
deb/debian/source/format → packaging/debian/source/format


+ 1 - 1
deb/Makefile.deb → packaging/ubuntu/Makefile

@@ -1,4 +1,4 @@
-PKG_NAME=dotcloud-docker
+PKG_NAME=lxc-docker
 PKG_ARCH=amd64
 PKG_VERSION=1
 ROOT_PATH:=$(PWD)

+ 5 - 0
packaging/ubuntu/debian/changelog

@@ -0,0 +1,5 @@
+lxc-docker (1) precise; urgency=low
+
+  * Initial release
+
+ -- dotCloud <ops@dotcloud.com>  Mon, 25 Mar 2013 05:51:12 -0700

+ 0 - 0
deb/debian/compat → packaging/ubuntu/debian/compat


+ 7 - 8
deb/debian/control → packaging/ubuntu/debian/control

@@ -1,16 +1,15 @@
-Source: dotcloud-docker
+Source: lxc-docker
 Section: misc
 Priority: extra
-Homepage: https://github.com/dotcloud/docker
+Homepage: http://docker.io
 Maintainer: Daniel Mizyrycki <daniel@dotcloud.com>
-Build-Depends: debhelper (>= 8.0.0), git, golang
-Vcs-Git: https://github.com/dotcloud/docker.git
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8.0.0), pkg-config, git, golang, libsqlite3-dev
+Vcs-Git: http://github.com/dotcloud/docker.git
+Standards-Version: 3.9.3
 
-Package: dotcloud-docker
+Package: lxc-docker
 Architecture: amd64
-Provides: dotcloud-docker
-Depends: lxc, wget, bsdtar, curl
+Depends: ${shlibs:Depends}, ${misc:Depends}, lxc, wget, bsdtar, curl, sqlite3
 Conflicts: docker
 Description: A process manager with superpowers
     It encapsulates heterogeneous payloads in Standard Containers, and runs

+ 1 - 1
deb/debian/copyright → packaging/ubuntu/debian/copyright

@@ -1,5 +1,5 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: dotcloud-docker
+Upstream-Name: docker
 Source: https://github.com/dotcloud/docker
 
 Files: *

+ 1 - 0
packaging/ubuntu/debian/docs

@@ -0,0 +1 @@
+README.md

+ 0 - 0
deb/debian/rules → packaging/ubuntu/debian/rules


+ 1 - 0
packaging/ubuntu/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

+ 0 - 0
deb/etc/docker.upstart → packaging/ubuntu/etc/docker.upstart