From 7cf86e6114a05ddf3af8b8e8a72a7163a72f8695 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Fri, 1 May 2015 15:23:33 -0700 Subject: [PATCH] Fix docker support --- Dockerfile | 2 +- pkg/storage/donut/donut_disk_internal.go | 11 ++++++----- pkg/storage/donut/donut_test.go | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a6a7be8f..5ebb1fcf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,4 +31,4 @@ RUN apt-get remove -y build-essential curl git && \ EXPOSE 9000 9001 -CMD ["sh", "-c", "${GOPATH}/bin/minio"] +CMD ["sh", "-c", "${GOPATH}/bin/minio mode memory 2G"] diff --git a/pkg/storage/donut/donut_disk_internal.go b/pkg/storage/donut/donut_disk_internal.go index 88a36c887..ecc971f6d 100644 --- a/pkg/storage/donut/donut_disk_internal.go +++ b/pkg/storage/donut/donut_disk_internal.go @@ -44,16 +44,17 @@ func (d disk) formatBytes(i int64) (result string) { // fsType2StrinMap - list of filesystems supported by donut var fsType2StringMap = map[string]string{ + "01021994": "TMPFS", "137d": "EXT", - "ef51": "EXT2OLD", - "ef53": "EXT4", "4244": "HFS", - "5346544e": "NTFS", "4d44": "MSDOS", "52654973": "REISERFS", - "6969": "NFS", - "01021994": "TMPFS", + "5346544e": "NTFS", "58465342": "XFS", + "61756673": "AUFS", + "6969": "NFS", + "ef51": "EXT2OLD", + "ef53": "EXT4", } // getFSType - get filesystem type diff --git a/pkg/storage/donut/donut_test.go b/pkg/storage/donut/donut_test.go index 720942fe0..8dfd05a8f 100644 --- a/pkg/storage/donut/donut_test.go +++ b/pkg/storage/donut/donut_test.go @@ -29,6 +29,7 @@ import ( "time" . "github.com/minio-io/check" + "log" ) func Test(t *testing.T) { TestingT(t) } @@ -172,6 +173,7 @@ func (s *MySuite) TestNewObjectMetadata(c *C) { c.Assert(err, IsNil) defer os.RemoveAll(root) donut, err := NewDonut("test", createTestNodeDiskMap(root)) + log.Println(err) c.Assert(err, IsNil) metadata := make(map[string]string)