Pārlūkot izejas kodu

Merge pull request #1065 from dotcloud/bump_0.4.7

Bump version to 0.4.7
Solomon Hykes 12 gadi atpakaļ
vecāks
revīzija
d67d5dd963
3 mainītis faili ar 19 papildinājumiem un 6 dzēšanām
  1. 12 0
      CHANGELOG.md
  2. 6 5
      buildfile_test.go
  3. 1 1
      commands.go

+ 12 - 0
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.
 

+ 6 - 5
buildfile_test.go

@@ -4,12 +4,13 @@ import (
 	"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 @@ type testContextTemplate struct {
 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 @@ run    [ "$(ls -d /var/run/sshd)" = "/var/run/sshd" ]
 
 	{
 		`
-from docker-ut
+from %s
 add foo /usr/lib/bla/bar
 run [ "$(cat /usr/lib/bla/bar)" = 'hello world!' ]
 `,
@@ -49,7 +50,7 @@ run [ "$(cat /usr/lib/bla/bar)" = 'hello world!' ]
 
 	{
 		`
-from docker-ut
+from %s
 add f /
 run [ "$(cat /f)" = "hello" ]
 add f /abc
@@ -75,7 +76,7 @@ run [ "$(cat /somewheeeere/over/the/rainbooow/ga)" = "bu" ]
 
 	{
 		`
-from docker-ut
+from %s
 env    FOO BAR
 run    [ "$FOO" = "BAR" ]
 `,

+ 1 - 1
commands.go

@@ -28,7 +28,7 @@ import (
 	"unicode"
 )
 
-const VERSION = "0.4.6"
+const VERSION = "0.4.7"
 
 var (
 	GITCOMMIT string