Skip to content

Commit

Permalink
Add 'build' to types.go
Browse files Browse the repository at this point in the history
This adds 'build' to types.go in order for projects that use docker/cli
to parse Docker Compose files to correctly retrieve `build` keys

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
  • Loading branch information
cdrage committed Sep 13, 2017
1 parent e600621 commit 9bdb076
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 2 deletions.
15 changes: 15 additions & 0 deletions cli/compose/loader/full-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@ version: "3.4"

services:
foo:

build:
context: ./dir
dockerfile: Dockerfile
args:
foo: bar
target: foo
network: foo
cache_from:
- foo
- bar
labels: [FOO=BAR]



cap_add:
- ALL

Expand Down
15 changes: 13 additions & 2 deletions cli/compose/loader/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,14 @@ version: "3"
services:
web:
image: web
build: ./web
build:
context: ./web
links:
- bar
db:
image: db
build: ./db
build:
context: ./db
`))
assert.NoError(t, err)

Expand Down Expand Up @@ -686,6 +688,15 @@ func TestFullExample(t *testing.T) {
expectedServiceConfig := types.ServiceConfig{
Name: "foo",

Build: types.BuildConfig{
Context: "./dir",
Dockerfile: "Dockerfile",
Args: map[string]*string{"foo": strPtr("bar")},
Target: "foo",
Network: "foo",
CacheFrom: []string{"foo", "bar"},
Labels: map[string]string{"FOO": "BAR"},
},
CapAdd: []string{"ALL"},
CapDrop: []string{"NET_ADMIN", "SYS_ADMIN"},
CgroupParent: "m-executor-abcd",
Expand Down
13 changes: 13 additions & 0 deletions cli/compose/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type Config struct {
type ServiceConfig struct {
Name string

Build BuildConfig
CapAdd []string `mapstructure:"cap_add"`
CapDrop []string `mapstructure:"cap_drop"`
CgroupParent string `mapstructure:"cgroup_parent"`
Expand Down Expand Up @@ -125,6 +126,18 @@ type ServiceConfig struct {
WorkingDir string `mapstructure:"working_dir"`
}

// BuildConfig is a type for build
// using the same format at libcompose: https://github.com/docker/libcompose/blob/master/yaml/build.go#L12
type BuildConfig struct {
Context string
Dockerfile string
Args MappingWithEquals
Labels Labels
CacheFrom StringList `mapstructure:"cache_from"`
Network string
Target string
}

// ShellCommand is a string or list of string args
type ShellCommand []string

Expand Down

0 comments on commit 9bdb076

Please sign in to comment.