From 8e6ba343bfb93ed7782d50a3ac1b581ae0e1fb00 Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Wed, 17 Apr 2013 21:10:53 -0700 Subject: [PATCH] packaging-ubuntu, issue #30: Ensure docker package installs and passes tests on official vagrant Ubuntu 12.04 box --- packaging/ubuntu/Makefile | 3 +++ packaging/ubuntu/Vagrantfile | 6 +++--- packaging/ubuntu/changelog | 10 +++++++++- packaging/ubuntu/docker.upstart | 4 ++-- packaging/ubuntu/maintainer.ubuntu | 9 +++++---- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/packaging/ubuntu/Makefile b/packaging/ubuntu/Makefile index 0443d8b3e6..8e0634870e 100644 --- a/packaging/ubuntu/Makefile +++ b/packaging/ubuntu/Makefile @@ -23,8 +23,11 @@ install: # Used by dpkg-buildpackage mkdir -p ${DESTDIR}/usr/bin mkdir -p ${DESTDIR}/etc/init + mkdir -p ${DESTDIR}/DEBIAN install -m 0755 src/${GITHUB_PATH}/docker/docker ${DESTDIR}/usr/bin install -o root -m 0755 debian/docker.upstart ${DESTDIR}/etc/init/docker.conf + install debian/lxc-docker.prerm ${DESTDIR}/DEBIAN/prerm + install debian/lxc-docker.postinst ${DESTDIR}/DEBIAN/postinst ubuntu: # This Makefile will compile the github master branch of dotcloud/docker diff --git a/packaging/ubuntu/Vagrantfile b/packaging/ubuntu/Vagrantfile index 2c9018ab98..0689eea1c2 100644 --- a/packaging/ubuntu/Vagrantfile +++ b/packaging/ubuntu/Vagrantfile @@ -1,12 +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.box = 'precise64' + config.vm.box_url = 'http://files.vagrantup.com/precise64.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 DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -qq -y git debhelper autotools-dev devscripts golang' config.vm.provision :shell, :inline => "export GPG_KEY='#{ENV['GPG_KEY']}'; cd /data/docker/packaging/ubuntu; make ubuntu" end diff --git a/packaging/ubuntu/changelog b/packaging/ubuntu/changelog index 515a927f5e..aa5ea6cc87 100644 --- a/packaging/ubuntu/changelog +++ b/packaging/ubuntu/changelog @@ -1,9 +1,17 @@ +lxc-docker (0.1.6-1) precise; urgency=low + + Improvements [+], Updates [*], Bug fixes [-]: + + Multiple improvements, updates and bug fixes + + -- dotCloud Wed, 17 Apr 2013 20:43:43 -0700 + + lxc-docker (0.1.4.1-1) precise; urgency=low Improvements [+], Updates [*], Bug fixes [-]: * Test PPA - -- dotCloud Fri, 15 Apr 2013 12:14:50 -0700 + -- dotCloud Mon, 15 Apr 2013 12:14:50 -0700 lxc-docker (0.1.4-1) precise; urgency=low diff --git a/packaging/ubuntu/docker.upstart b/packaging/ubuntu/docker.upstart index 4e49a3fa9a..07e7e8a890 100644 --- a/packaging/ubuntu/docker.upstart +++ b/packaging/ubuntu/docker.upstart @@ -5,6 +5,6 @@ stop on starting rc RUNLEVEL=[016] respawn script - /usr/bin/test -f /etc/default/locale && . /etc/default/locale || true - LANG=$LANG LC_ALL=$LANG /usr/bin/docker -d + # FIXME: docker should not depend on the system having en_US.UTF-8 + LC_ALL='en_US.UTF-8' /usr/bin/docker -d end script diff --git a/packaging/ubuntu/maintainer.ubuntu b/packaging/ubuntu/maintainer.ubuntu index d69ba462a4..406498ebad 100644 --- a/packaging/ubuntu/maintainer.ubuntu +++ b/packaging/ubuntu/maintainer.ubuntu @@ -5,14 +5,15 @@ 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 :: +For now, 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 -~~~~~~~~~~~~~~~~~~~~~~~~ +Releasing 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,