From 3b9c97a5d598a04da8247939e2a7f6f123350366 Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Wed, 13 Mar 2013 17:08:04 -0700 Subject: [PATCH 1/7] packaging; issue #30: Add ubuntu deb packaging --- AUTHORS | 13 +++ Makefile | 44 +++++---- debian/changelog | 11 +++ debian/compat | 1 + debian/control | 20 ++++ debian/copyright | 208 +++++++++++++++++++++++++++++++++++++++++ debian/docs | 1 + debian/rules | 13 +++ debian/source/format | 1 + etc/docker-dev.upstart | 10 ++ 10 files changed, 303 insertions(+), 19 deletions(-) create mode 100644 AUTHORS create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 etc/docker-dev.upstart diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000000..85decb361a --- /dev/null +++ b/AUTHORS @@ -0,0 +1,13 @@ +Solomon Hykes +Sam Alba +Jérôme Petazzoni +Andrea Luzzardi +Joffrey Fuhrer +Louis Opter +Niall O'Higgins +Brian McCallister +Jeff Lindsay +Ken Cochrane +Charles Hooper +Guillaume Charmes +Daniel Mizyrycki diff --git a/Makefile b/Makefile index 1cc48f9263..fc7af07b97 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,29 @@ -GOPATH := $(PWD)/env -BUILDPATH := $(PWD)/build +PKG_NAME=docker-dev +PKG_VERSION=1 +ROOT_PATH:=$(PWD) +BUILD_PATH=build +BUILD_SRC=build_src +GITHUB_PATH=src/github.com/dotcloud/docker +INSDIR=usr/bin -all: docker.o dockerd.o +all: + cp -r $(BUILD_SRC) $(BUILD_PATH) + cd $(BUILD_PATH)/$(GITHUB_PATH)/docker; GOPATH=$(ROOT_PATH)/$(BUILD_PATH) go build -env: - mkdir -p ${BUILDPATH} ${GOPATH}/src/github.com/dotcloud/ - ln -s $(PWD) ${GOPATH}/src/github.com/dotcloud/docker +# DESTDIR provided by Debian packaging +install: all + mkdir -p $(DESTDIR)/$(INSDIR) + mkdir -p $(DESTDIR)/etc/init + install -m 0755 $(BUILD_PATH)/$(GITHUB_PATH)/docker/docker $(DESTDIR)/$(INSDIR) + install -o root -m 0755 $(ROOT_PATH)/etc/docker-dev.upstart $(DESTDIR)/etc/init/docker-dev.conf -deps: - GOPATH=${GOPATH} go get github.com/kr/pty - GOPATH=${GOPATH} go get github.com/mattn/go-sqlite3 - GOPATH=${GOPATH} go get github.com/shykes/gorp +# Build deb package fetching go dependencies and cleaning up git repositories +deb: cleanup + GOPATH=$(ROOT_PATH)/$(BUILD_SRC) go get -d github.com/dotcloud/docker + for d in `find . -name '.git*'`; do rm -rf $$d; done + tar czf ../$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz * + dpkg-buildpackage + rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files -clean: - go clean - rm -rf env build - -docker.o: env deps - GOPATH=${GOPATH} go build -o ${BUILDPATH}/docker docker/docker.go - -dockerd.o: env deps - GOPATH=${GOPATH} go build -o ${BUILDPATH}/dockerd dockerd/dockerd.go +cleanup: + rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000000..27e5411f63 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,11 @@ +docker-dev (1) precise; urgency=low + + * Update release + + -- dotCloud Mon, 13 Mar 2013 16:44:21 -0700 + +docker-dev (0.1-1) precise; urgency=low + + * Initial release (Closes: #30) + + -- dotCloud Mon, 11 Mar 2013 21:05:56 -0700 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000000..45a4fb75db --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000000..c08200bc55 --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: docker-dev +Section: misc +Priority: extra +Homepage: https://github.com/dotcloud/docker +Maintainer: Daniel Mizyrycki +Build-Depends: debhelper (>= 8.0.0), git, golang, libsqlite3-dev +Vcs-Git: https://github.com/dotcloud/docker.git +Standards-Version: 3.9.2 + +Package: docker-dev +Architecture: amd64 +Provides: docker-dev +Depends: lxc, wget, bsdtar, curl, sqlite3 +Description: Docker + Docker is 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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000000..0ef85edfb0 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,208 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: docker-dev +Source: https://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. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000000..b43bf86b50 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000000..955dd78b6a --- /dev/null +++ b/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 $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/etc/docker-dev.upstart b/etc/docker-dev.upstart new file mode 100644 index 0000000000..6cfe9d2616 --- /dev/null +++ b/etc/docker-dev.upstart @@ -0,0 +1,10 @@ +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 From d615496c4caeea1b438ccd1e15c23c8fd7efa425 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Wed, 13 Mar 2013 21:11:05 -0700 Subject: [PATCH 2/7] Gradual improvement of Makefile --- Makefile | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index fc7af07b97..a538f09508 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,54 @@ PKG_NAME=docker-dev +PKG_ARCH=amd64 PKG_VERSION=1 ROOT_PATH:=$(PWD) -BUILD_PATH=build +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 -all: - cp -r $(BUILD_SRC) $(BUILD_PATH) - cd $(BUILD_PATH)/$(GITHUB_PATH)/docker; GOPATH=$(ROOT_PATH)/$(BUILD_PATH) go build +TMPDIR=$(shell mktemp -d -t XXXXXX) + +# Build a debian source package +all: 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 # DESTDIR provided by Debian packaging -install: all +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 $(BUILD_PATH)/$(GITHUB_PATH)/docker/docker $(DESTDIR)/$(INSDIR) - install -o root -m 0755 $(ROOT_PATH)/etc/docker-dev.upstart $(DESTDIR)/etc/init/docker-dev.conf + install -m 0755 bin/docker $(DESTDIR)/$(INSDIR) + install -o root -m 0755 etc/docker-dev.upstart $(DESTDIR)/etc/init/docker-dev.conf + +$(BUILD_SRC): cleanup + # 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: cleanup - GOPATH=$(ROOT_PATH)/$(BUILD_SRC) go get -d github.com/dotcloud/docker - for d in `find . -name '.git*'`; do rm -rf $$d; done - tar czf ../$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz * - dpkg-buildpackage +deb: $(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) + cleanup: - rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) + rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz From 9598b289339b7e99bb8b86810f1bd69b812dc608 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Wed, 13 Mar 2013 21:22:30 -0700 Subject: [PATCH 3/7] Moved debian-specific files to ./deb, minor fixes to Makefile --- .gitignore | 1 + Makefile | 4 +++- deb/Makefile | 1 + deb/README.md | 1 + {debian => deb/debian}/changelog | 0 {debian => deb/debian}/compat | 0 {debian => deb/debian}/control | 0 {debian => deb/debian}/copyright | 0 {debian => deb/debian}/docs | 0 {debian => deb/debian}/rules | 0 {debian => deb/debian}/source/format | 0 deb/etc/docker-dev.upstart | 10 ++++++++++ 12 files changed, 16 insertions(+), 1 deletion(-) create mode 120000 deb/Makefile create mode 120000 deb/README.md rename {debian => deb/debian}/changelog (100%) rename {debian => deb/debian}/compat (100%) rename {debian => deb/debian}/control (100%) rename {debian => deb/debian}/copyright (100%) rename {debian => deb/debian}/docs (100%) rename {debian => deb/debian}/rules (100%) rename {debian => deb/debian}/source/format (100%) create mode 100644 deb/etc/docker-dev.upstart diff --git a/.gitignore b/.gitignore index 686ac83428..3ef8361c92 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ docker/docker .*.swp a.out *.orig +build_src diff --git a/Makefile b/Makefile index a538f09508..dfb9702baa 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,9 @@ $(SOURCE_PACKAGE): $(BUILD_SRC) tar -f $(SOURCE_PACKAGE) -C ${ROOT_PATH}/${BUILD_SRC} -cz . # Build deb package fetching go dependencies and cleaning up git repositories -deb: $(SOURCE_PACKAGE) +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 diff --git a/deb/Makefile b/deb/Makefile new file mode 120000 index 0000000000..d0b0e8e008 --- /dev/null +++ b/deb/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/deb/README.md b/deb/README.md new file mode 120000 index 0000000000..32d46ee883 --- /dev/null +++ b/deb/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/debian/changelog b/deb/debian/changelog similarity index 100% rename from debian/changelog rename to deb/debian/changelog diff --git a/debian/compat b/deb/debian/compat similarity index 100% rename from debian/compat rename to deb/debian/compat diff --git a/debian/control b/deb/debian/control similarity index 100% rename from debian/control rename to deb/debian/control diff --git a/debian/copyright b/deb/debian/copyright similarity index 100% rename from debian/copyright rename to deb/debian/copyright diff --git a/debian/docs b/deb/debian/docs similarity index 100% rename from debian/docs rename to deb/debian/docs diff --git a/debian/rules b/deb/debian/rules similarity index 100% rename from debian/rules rename to deb/debian/rules diff --git a/debian/source/format b/deb/debian/source/format similarity index 100% rename from debian/source/format rename to deb/debian/source/format diff --git a/deb/etc/docker-dev.upstart b/deb/etc/docker-dev.upstart new file mode 100644 index 0000000000..6cfe9d2616 --- /dev/null +++ b/deb/etc/docker-dev.upstart @@ -0,0 +1,10 @@ +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 From 76bd475648bdcbd0b1ac4bb4e60763394dc7a52a Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Thu, 14 Mar 2013 04:01:22 -0700 Subject: [PATCH 4/7] packaging; issue #30: Improved dependencies --- deb/debian/changelog | 10 ++-------- deb/debian/control | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/deb/debian/changelog b/deb/debian/changelog index 27e5411f63..552a0868f5 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,11 +1,5 @@ docker-dev (1) precise; urgency=low - * Update release + * Initial release - -- dotCloud Mon, 13 Mar 2013 16:44:21 -0700 - -docker-dev (0.1-1) precise; urgency=low - - * Initial release (Closes: #30) - - -- dotCloud Mon, 11 Mar 2013 21:05:56 -0700 + -- dotCloud Mon, 14 Mar 2013 03:26:21 -0700 diff --git a/deb/debian/control b/deb/debian/control index c08200bc55..420850c552 100644 --- a/deb/debian/control +++ b/deb/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Homepage: https://github.com/dotcloud/docker Maintainer: Daniel Mizyrycki -Build-Depends: debhelper (>= 8.0.0), git, golang, libsqlite3-dev +Build-Depends: debhelper (>= 8.0.0), pkg-config, git, golang, libsqlite3-dev Vcs-Git: https://github.com/dotcloud/docker.git Standards-Version: 3.9.2 From 47a5a51d396552d140cbf27a13b7813719f1980b Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Thu, 14 Mar 2013 19:44:32 -0700 Subject: [PATCH 5/7] packaging; issue #30: Adjust package metadata --- Makefile | 4 ++-- deb/debian/changelog | 4 ++-- deb/debian/control | 10 +++++----- deb/debian/copyright | 3 ++- deb/etc/{docker-dev.upstart => docker.upstart} | 0 5 files changed, 11 insertions(+), 10 deletions(-) rename deb/etc/{docker-dev.upstart => docker.upstart} (100%) diff --git a/Makefile b/Makefile index dfb9702baa..438559e977 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PKG_NAME=docker-dev +PKG_NAME=dotcloud-docker PKG_ARCH=amd64 PKG_VERSION=1 ROOT_PATH:=$(PWD) @@ -25,7 +25,7 @@ install: mkdir -p $(DESTDIR)/$(INSDIR) mkdir -p $(DESTDIR)/etc/init install -m 0755 bin/docker $(DESTDIR)/$(INSDIR) - install -o root -m 0755 etc/docker-dev.upstart $(DESTDIR)/etc/init/docker-dev.conf + install -o root -m 0755 etc/docker.upstart $(DESTDIR)/etc/init/docker.conf $(BUILD_SRC): cleanup # Copy ourselves into $BUILD_SRC to comply with unusual golang constraints diff --git a/deb/debian/changelog b/deb/debian/changelog index 552a0868f5..76cc04bee2 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -1,5 +1,5 @@ -docker-dev (1) precise; urgency=low +dotcloud-docker (1) precise; urgency=low * Initial release - -- dotCloud Mon, 14 Mar 2013 03:26:21 -0700 + -- dotCloud Mon, 14 Mar 2013 04:43:21 -0700 diff --git a/deb/debian/control b/deb/debian/control index 420850c552..35a842df1e 100644 --- a/deb/debian/control +++ b/deb/debian/control @@ -1,4 +1,4 @@ -Source: docker-dev +Source: dotcloud-docker Section: misc Priority: extra Homepage: https://github.com/dotcloud/docker @@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 8.0.0), pkg-config, git, golang, libsqlite3-dev Vcs-Git: https://github.com/dotcloud/docker.git Standards-Version: 3.9.2 -Package: docker-dev +Package: dotcloud-docker Architecture: amd64 -Provides: docker-dev +Provides: dotcloud-docker Depends: lxc, wget, bsdtar, curl, sqlite3 -Description: Docker - Docker is a process manager with superpowers. +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: diff --git a/deb/debian/copyright b/deb/debian/copyright index 0ef85edfb0..6f3a66bbce 100644 --- a/deb/debian/copyright +++ b/deb/debian/copyright @@ -1,6 +1,7 @@ Format: http://dep.debian.net/deps/dep5 -Upstream-Name: docker-dev +Upstream-Name: dotcloud-docker Source: https://github.com/dotcloud/docker + Files: * Copyright: 2012 DotCloud Inc (opensource@dotcloud.com) License: Apache License Version 2.0 diff --git a/deb/etc/docker-dev.upstart b/deb/etc/docker.upstart similarity index 100% rename from deb/etc/docker-dev.upstart rename to deb/etc/docker.upstart From eab39dc3fa563476981a4221af40cd281cdf97f0 Mon Sep 17 00:00:00 2001 From: creack Date: Thu, 14 Mar 2013 21:13:33 -0700 Subject: [PATCH 6/7] Add local build and tests to makefile --- Makefile | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 438559e977..441017e2c2 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,39 @@ 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 +SOURCE_PACKAGE=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz DEB_PACKAGE=$(PKG_NAME)_$(PKG_VERSION)_$(PKG_ARCH).deb TMPDIR=$(shell mktemp -d -t XXXXXX) +EXTRA_GO_PKG=fs auth + +# Build local sources +$(PKG_NAME): build_local + +build_local: + -@mkdir -p bin + cd docker && go build -o ../bin/docker + +test: + @echo "\033[36m[Testing]\033[00m docker..." + @sudo -E go test -v && \ + echo -n "\033[32m[OK]\033[00m" || \ + echo -n "\033[31m[FAIL]\033[00m"; \ + echo " docker" + @echo "Testing extra repos {$(EXTRA_GO_PKG)}" + @for package in $(EXTRA_GO_PKG); do \ + echo "\033[36m[Testing]\033[00m docker/$$package..." && \ + cd $$package ; \ + sudo -E go test -v && \ + echo -n "\033[32m[OK]\033[00m" || \ + echo -n "\033[31m[FAIL]\033[00m" ; \ + echo " docker/$$package" ; \ + cd .. ;\ + done + @sudo rm -rf /tmp/docker-* + + # Build a debian source package all: build_in_deb @@ -44,7 +72,7 @@ $(SOURCE_PACKAGE): $(BUILD_SRC) # 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 From 0e0d76b7acc8d75f518a91d026a57d6b8410d5f3 Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Thu, 14 Mar 2013 22:48:45 -0700 Subject: [PATCH 7/7] packaging; issue #30: Add tests to Makefile --- Makefile | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 441017e2c2..28856eb622 100644 --- a/Makefile +++ b/Makefile @@ -8,35 +8,9 @@ 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 - -TMPDIR=$(shell mktemp -d -t XXXXXX) - EXTRA_GO_PKG=fs auth -# Build local sources -$(PKG_NAME): build_local - -build_local: - -@mkdir -p bin - cd docker && go build -o ../bin/docker - -test: - @echo "\033[36m[Testing]\033[00m docker..." - @sudo -E go test -v && \ - echo -n "\033[32m[OK]\033[00m" || \ - echo -n "\033[31m[FAIL]\033[00m"; \ - echo " docker" - @echo "Testing extra repos {$(EXTRA_GO_PKG)}" - @for package in $(EXTRA_GO_PKG); do \ - echo "\033[36m[Testing]\033[00m docker/$$package..." && \ - cd $$package ; \ - sudo -E go test -v && \ - echo -n "\033[32m[OK]\033[00m" || \ - echo -n "\033[31m[FAIL]\033[00m" ; \ - echo " docker/$$package" ; \ - cd .. ;\ - done - @sudo rm -rf /tmp/docker-* +TMPDIR=$(shell mktemp -d -t XXXXXX) # Build a debian source package @@ -80,5 +54,31 @@ $(DEB_PACKAGE): $(SOURCE_PACKAGE) 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 && \ + echo -n "\033[32m[OK]\033[00m" || \ + echo -n "\033[31m[FAIL]\033[00m"; \ + echo " docker" + @echo "Testing extra repos {$(EXTRA_GO_PKG)}" + @for package in $(EXTRA_GO_PKG); do \ + echo "\033[36m[Testing]\033[00m docker/$$package..." && \ + cd $$package ; \ + sudo -E GOPATH=$(ROOT_PATH)/$(BUILD_SRC) go test -v && \ + echo -n "\033[32m[OK]\033[00m" || \ + echo -n "\033[31m[FAIL]\033[00m" ; \ + echo " docker/$$package" ; \ + cd .. ;\ + done + @sudo rm -rf /tmp/docker-* + cleanup: + rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz