github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from chanwit/add_source

Browse Source 
add Source attribute to File
This commit is contained in:
Justin Cormack 2017-05-22 11:28:06 +01:00 committed by GitHub
commit b47f3dec4a
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/moby/config.go
View File

@ -6,6 +6,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
@ -35,6 +36,7 @@ type Moby struct {
Directory bool
Symlink string
Contents string
Source string
}
Outputs []struct {
Format string
@ -671,7 +673,16 @@ func filesystem(m Moby) (*bytes.Buffer, error) {
return buf, errors.New("Did not specify path for file")
}
if !f.Directory && f.Contents == "" && f.Symlink == "" {
return buf, errors.New("Contents of file not specified")
if f.Source == "" {
return buf, errors.New("Contents of file not specified")
}
contents, err := ioutil.ReadFile(f.Source)
if err != nil {
return buf, err
}
f.Contents = string(contents)
}
// we need all the leading directories
parts := strings.Split(path.Dir(f.Path), "/")

17
cmd/moby/schema.go
View File

@ -21,11 +21,12 @@ var schema = string(`
"path": {"type": "string"},
"directory": {"type": "boolean"},
"symlink": {"type": "string"},
"contents": {"type": "string"}
"contents": {"type": "string"},
"source": {"type": "string"}
}
},
"files": {
"type": "array",
"type": "array",
"items": { "$ref": "#/definitions/file" }
},
"output": {
@ -36,7 +37,7 @@ var schema = string(`
}
},
"outputs": {
"type": "array",
"type": "array",
"items": { "$ref": "#/definitions/output" }
},
"trust": {
@ -48,7 +49,7 @@ var schema = string(`
}
},
"strings": {
"type": "array",
"type": "array",
"items": {"type": "string"}
},
"mount": {
@ -89,7 +90,7 @@ var schema = string(`
"uid": {"type": "integer"},
"gid": {"type": "integer"},
"additionalGids": {
"type": "array",
"type": "array",
"items": { "type": "integer" }
},
"noNewPrivileges": {"type": "boolean"},
@ -99,18 +100,18 @@ var schema = string(`
"rootfsPropagation": {"type": "string"},
"cgroupsPath": {"type": "string"},
"sysctl": {
"type": "array",
"type": "array",
"items": { "$ref": "#/definitions/strings" }
}
}
},
"images": {
"type": "array",
"type": "array",
"items": { "$ref": "#/definitions/image" }
}
},
"properties": {
"kernel": { "$ref": "#/definitions/kernel" },
"kernel": { "$ref": "#/definitions/kernel" },
"init": { "$ref": "#/definitions/strings" },
"onboot": { "$ref": "#/definitions/images" },
"services": { "$ref": "#/definitions/images" },