github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 04:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1482 from justincormack/split-inspect

Browse Source 
Split out OCI generation function
This commit is contained in:
Justin Cormack 2017-04-04 12:25:15 +01:00 committed by GitHub
commit 87ebac9976
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/moby/config.go
View File

@ -10,6 +10,7 @@ import (
"strings" "strings"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )
@ -76,7 +77,6 @@ func NewConfig(config []byte) (*Moby, error) {
// ConfigToOCI converts a config specification to an OCI config file // ConfigToOCI converts a config specification to an OCI config file
func ConfigToOCI(image *MobyImage) ([]byte, error) { func ConfigToOCI(image *MobyImage) ([]byte, error) {
oci := specs.Spec{}
// TODO pass through same docker client to all functions // TODO pass through same docker client to all functions
cli, err := dockerClient() cli, err := dockerClient()
@ -89,6 +89,13 @@ func ConfigToOCI(image *MobyImage) ([]byte, error) {
return []byte{}, err return []byte{}, err
} }
return ConfigInspectToOCI(image, inspect)
}
// ConfigInspectToOCI converts a config and the output of image inspect to an OCI config file
func ConfigInspectToOCI(image *MobyImage, inspect types.ImageInspect) ([]byte, error) {
oci := specs.Spec{}
config := inspect.Config config := inspect.Config
if config == nil { if config == nil {
return []byte{}, errors.New("empty image config") return []byte{}, errors.New("empty image config")