beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

packaging-ubuntu, issue #30: Ensure docker package installs and passes tests on official vagrant Ubuntu 12.04 box

Browse source
This commit is contained in:
Daniel Mizyrycki 2013-04-17 21:10:53 -07:00
parent 523cd8e29c
commit 8e6ba343bf
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packaging/ubuntu/Makefile
View file

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

6
packaging/ubuntu/Vagrantfile vendored
View file

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

10
packaging/ubuntu/changelog
View file

@ -1,9 +1,17 @@
lxc-docker (0.1.6-1) precise; urgency=low
Improvements [+], Updates [*], Bug fixes [-]:
+ Multiple improvements, updates and bug fixes
-- dotCloud <ops@dotcloud.com> 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 <ops@dotcloud.com> Fri, 15 Apr 2013 12:14:50 -0700
-- dotCloud <ops@dotcloud.com> Mon, 15 Apr 2013 12:14:50 -0700
lxc-docker (0.1.4-1) precise; urgency=low

4
packaging/ubuntu/docker.upstart
View file

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

9
packaging/ubuntu/maintainer.ubuntu
View file

@ -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,