Merge pull request #58 from wking/default-version

Mrunal Patel · Mrunal Patel · commit 3491ecc1824b · 2016-05-10T12:30:50.000-07:00
generate: Set ociVersion if it wasn't set in the template
diff --git a/generate.go b/generate.go
@@ -123,6 +123,9 @@ func loadTemplate(path string) (spec *rspec.Spec, err error) {
 }
 
 func modify(spec *rspec.Spec, context *cli.Context) error {
+	if len(spec.Version) == 0 {
+		spec.Version = rspec.Version
+	}
 	spec.Root.Path = context.String("rootfs")
 	if context.IsSet("read-only") {
 		spec.Root.Readonly = context.Bool("read-only")

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,9 @@ func loadTemplate(path string) (spec *rspec.Spec, err error) {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`func modify(spec rspec.Spec, context cli.Context) error {`
	`126`	`+ if len(spec.Version) == 0 {`
	`127`	`+ spec.Version = rspec.Version`
	`128`	`+ }`
`126`	`129`	`spec.Root.Path = context.String("rootfs")`
`127`	`130`	`if context.IsSet("read-only") {`
`128`	`131`	`spec.Root.Readonly = context.Bool("read-only")`