Merge pull request #559 from fkautz/pr_out_fix_docker_support

master
Frederick F. Kautz IV 10 years ago
commit 8e093eb6f6
  1. 2
      Dockerfile
  2. 11
      pkg/storage/donut/donut_disk_internal.go
  3. 2
      pkg/storage/donut/donut_test.go

@ -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"]

@ -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

@ -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)

Loading…
Cancel
Save