Browse code

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

Daniel Mizyrycki authored on 2013/04/18 13:10:53
Showing 5 changed files
... ...
@@ -23,8 +23,11 @@ install:
23 23
 	# Used by dpkg-buildpackage
24 24
 	mkdir -p ${DESTDIR}/usr/bin
25 25
 	mkdir -p ${DESTDIR}/etc/init
26
+	mkdir -p ${DESTDIR}/DEBIAN
26 27
 	install -m 0755 src/${GITHUB_PATH}/docker/docker ${DESTDIR}/usr/bin
27 28
 	install -o root -m 0755 debian/docker.upstart ${DESTDIR}/etc/init/docker.conf
29
+	install debian/lxc-docker.prerm ${DESTDIR}/DEBIAN/prerm
30
+	install debian/lxc-docker.postinst ${DESTDIR}/DEBIAN/postinst
28 31
 
29 32
 ubuntu:
30 33
 	# This Makefile will compile the github master branch of dotcloud/docker
... ...
@@ -1,12 +1,12 @@
1 1
 BUILDBOT_IP = '192.168.33.32'
2 2
 
3 3
 Vagrant::Config.run do |config|
4
-  config.vm.box = 'quantal64_3.5.0-25'
5
-  config.vm.box_url = 'http://get.docker.io/vbox/ubuntu/12.10/quantal64_3.5.0-25.box'
4
+  config.vm.box = 'precise64'
5
+  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
6 6
   config.vm.share_folder 'v-data', '/data/docker', "#{File.dirname(__FILE__)}/../.."
7 7
   config.vm.network :hostonly,BUILDBOT_IP
8 8
 
9 9
   # Install ubuntu packaging dependencies and create ubuntu packages
10
-  config.vm.provision :shell, :inline => 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -qq -y debhelper autotools-dev devscripts golang'
10
+  config.vm.provision :shell, :inline => 'export DEBIAN_FRONTEND=noninteractive; apt-get -qq update; apt-get install -qq -y git debhelper autotools-dev devscripts golang'
11 11
   config.vm.provision :shell, :inline => "export GPG_KEY='#{ENV['GPG_KEY']}'; cd /data/docker/packaging/ubuntu; make ubuntu"
12 12
 end
... ...
@@ -1,9 +1,17 @@
1
+lxc-docker (0.1.6-1) precise; urgency=low
2
+
3
+  Improvements [+], Updates [*], Bug fixes [-]:
4
+  + Multiple improvements, updates and bug fixes
5
+
6
+ -- dotCloud <ops@dotcloud.com>  Wed, 17 Apr 2013 20:43:43 -0700
7
+
8
+
1 9
 lxc-docker (0.1.4.1-1) precise; urgency=low
2 10
 
3 11
   Improvements [+], Updates [*], Bug fixes [-]:
4 12
   * Test PPA
5 13
 
6
- -- dotCloud <ops@dotcloud.com>  Fri, 15 Apr 2013 12:14:50 -0700
14
+ -- dotCloud <ops@dotcloud.com>  Mon, 15 Apr 2013 12:14:50 -0700
7 15
 
8 16
 
9 17
 lxc-docker (0.1.4-1) precise; urgency=low
... ...
@@ -5,6 +5,6 @@ stop on starting rc RUNLEVEL=[016]
5 5
 respawn
6 6
 
7 7
 script
8
-    /usr/bin/test -f /etc/default/locale && . /etc/default/locale || true
9
-    LANG=$LANG LC_ALL=$LANG /usr/bin/docker -d
8
+    # FIXME: docker should not depend on the system having en_US.UTF-8
9
+    LC_ALL='en_US.UTF-8' /usr/bin/docker -d
10 10
 end script
... ...
@@ -5,14 +5,15 @@ Ubuntu allows developers to use their PPA (Personal Package Archive)
5 5
 repository. This is very convenient for the users as they just need to add
6 6
 the PPA address, update their package database and use the apt-get tool.
7 7
 
8
-The official lxc-docker package is located on launchpad and can be accessed
9
-adding the following line to /etc/apt/sources.list ::
8
+For now, the official lxc-docker package is located on launchpad and can be
9
+accessed adding the following line to /etc/apt/sources.list ::
10
+
10 11
 
11 12
   deb http://ppa.launchpad.net/dotcloud/lxc-docker/ubuntu precise main
12 13
 
13 14
 
14
-Realeasing a new package
15
-~~~~~~~~~~~~~~~~~~~~~~~~
15
+Releasing a new package
16
+~~~~~~~~~~~~~~~~~~~~~~~
16 17
 
17 18
 The most relevant information to update is the changelog file:
18 19
 Each new release should create a new first paragraph with new release version,