Merge pull request #920 from dotcloud/919-packaging

Packaging, issue 919: Bump version to 0.4.2

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.4.2 (2013-06-17)
+ - Packaging: Bumped version to work around an Ubuntu bug
+
 ## 0.4.1 (2013-06-17)
  + Remote Api: Add flag to enable cross domain requests
  + Remote Api/Client: Add images and containers sizes in docker ps and docker images

commands.go

@@ -29,7 +29,7 @@ import (
 	"unicode"
 )
 
-const VERSION = "0.4.1"
+const VERSION = "0.4.2"
 
 var (
 	GITCOMMIT string

hack/dockerbuilder/Dockerfile

@@ -1,5 +1,13 @@
-# This will build a container capable of producing an official binary build of docker and
-# uploading it to S3
+# DESCRIPTION     Build a container capable of producing official binary and
+#                 PPA packages and uploading them to S3 and Launchpad
+# VERSION         1.2
+# DOCKER_VERSION  0.4
+# AUTHOR          Solomon Hykes <solomon@dotcloud.com>
+#                 Daniel Mizyrycki <daniel@dotcloud.net>
+# BUILD_CMD       docker build -t dockerbuilder .
+# RUN_CMD         docker run -e AWS_ID="$AWS_ID" -e AWS_KEY="$AWS_KEY" -e GPG_KEY="$GPG_KEY" dockerbuilder
+#
+#
 from	ubuntu:12.04
 maintainer	Solomon Hykes <solomon@dotcloud.com>
 # Workaround the upstart issue
@@ -8,7 +16,7 @@ run ln -s /bin/true /sbin/initctl
 # Enable universe and gophers PPA
 run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q python-software-properties
 run	add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe"
-run	add-apt-repository -y ppa:gophers/go/ubuntu
+run	add-apt-repository -y ppa:dotcloud/docker-golang/ubuntu
 run	apt-get update
 # Packages required to checkout, build and upload docker
 run	DEBIAN_FRONTEND=noninteractive apt-get install -y -q s3cmd

packaging/ubuntu/changelog

@@ -1,19 +1,24 @@
+lxc-docker (0.4.2-1) precise; urgency=low
+  - Packaging: Bumped version to work around an Ubuntu bug
+
+ -- dotCloud <ops@dotcloud.com>  Mon, 17 Jun 2013 00:00:00 -0700
+
 lxc-docker (0.4.1-1) precise; urgency=low
- - Builder: don't ignore last line in Dockerfile when it doesn't end with \n
- - Client: allow multiple params in inspect
- - Client: Print the container id before the hijack in `docker run`
- - Remote Api: Add flag to enable cross domain requests
- - Remote Api/Client: Add images and containers sizes in docker ps and docker images
- - Registry: add regexp check on repo's name
- - Registry: Move auth to the client
- - Registry: Remove login check on pull
- - Runtime: Configure dns configuration host-wide with 'docker -d -dns'
- - Runtime: Detect faulty DNS configuration and replace it with a public default
- - Runtime: allow docker run <name>:<id>
- - Runtime: you can now specify public port (ex: -p 80:4500)
- - Runtime: improved image removal to garbage-collect unreferenced parents
- - Vagrantfile: Add the rest api port to vagrantfile's port_forward
- - Upgrade to Go 1.1
+  - Builder: don't ignore last line in Dockerfile when it doesn't end with \n
+  - Client: allow multiple params in inspect
+  - Client: Print the container id before the hijack in `docker run`
+  - Remote Api: Add flag to enable cross domain requests
+  - Remote Api/Client: Add images and containers sizes in docker ps and docker images
+  - Registry: add regexp check on repo's name
+  - Registry: Move auth to the client
+  - Registry: Remove login check on pull
+  - Runtime: Configure dns configuration host-wide with 'docker -d -dns'
+  - Runtime: Detect faulty DNS configuration and replace it with a public default
+  - Runtime: allow docker run <name>:<id>
+  - Runtime: you can now specify public port (ex: -p 80:4500)
+  - Runtime: improved image removal to garbage-collect unreferenced parents
+  - Vagrantfile: Add the rest api port to vagrantfile's port_forward
+  - Upgrade to Go 1.1
 
  -- dotCloud <ops@dotcloud.com>  Mon, 17 Jun 2013 00:00:00 -0700