Merge pull request #1065 from dotcloud/bump_0.4.7

Bump version to 0.4.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98eb75b..4d6a7a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.4.7 (2013-06-28)
+ * Registry: easier push/pull to a custom registry
+ * Remote API: the progress bar updates faster when downloading and uploading large files
+ - Remote API: fix a bug in the optional unix socket transport
+ * Runtime: improve detection of kernel version
+ + Runtime: host directories can be mounted as volumes with 'docker run -b'
+ - Runtime: fix an issue when only attaching to stdin
+ * Runtime: use 'tar --numeric-owner' to avoid uid mismatch across multiple hosts
+ * Hack: improve test suite and dev environment
+ * Hack: remove dependency on unit tests on 'os/user'
+ + Documentation: add terminology section
+
 ## 0.4.6 (2013-06-22)
  - Runtime: fix a bug which caused creation of empty images (and volumes) to crash.
 
diff --git a/buildfile_test.go b/buildfile_test.go
index e64b108..c2ae79f 100644
--- a/buildfile_test.go
+++ b/buildfile_test.go
@@ -4,12 +4,13 @@
 	"io/ioutil"
 	"sync"
 	"testing"
+	"fmt"
 )
 
 // mkTestContext generates a build context from the contents of the provided dockerfile.
 // This context is suitable for use as an argument to BuildFile.Build()
 func mkTestContext(dockerfile string, files [][2]string, t *testing.T) Archive {
-	context, err := mkBuildContext(dockerfile, files)
+	context, err := mkBuildContext(fmt.Sprintf(dockerfile, unitTestImageId), files)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -29,7 +30,7 @@
 var testContexts []testContextTemplate = []testContextTemplate{
 	{
 		`
-from   docker-ut
+from   %s
 run    sh -c 'echo root:testpass > /tmp/passwd'
 run    mkdir -p /var/run/sshd
 run    [ "$(cat /tmp/passwd)" = "root:testpass" ]
@@ -40,7 +41,7 @@
 
 	{
 		`
-from docker-ut
+from %s
 add foo /usr/lib/bla/bar
 run [ "$(cat /usr/lib/bla/bar)" = 'hello world!' ]
 `,
@@ -49,7 +50,7 @@
 
 	{
 		`
-from docker-ut
+from %s
 add f /
 run [ "$(cat /f)" = "hello" ]
 add f /abc
@@ -75,7 +76,7 @@
 
 	{
 		`
-from docker-ut
+from %s
 env    FOO BAR
 run    [ "$FOO" = "BAR" ]
 `,
diff --git a/commands.go b/commands.go
index 4ef63f4..41938c5 100644
--- a/commands.go
+++ b/commands.go
@@ -28,7 +28,7 @@
 	"unicode"
 )
 
-const VERSION = "0.4.6"
+const VERSION = "0.4.7"
 
 var (
 	GITCOMMIT string