deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #449 from kadel/multiple-go-versions

Browse Source 
Test with multiple go versions
This commit is contained in:
Charlie Drage 2017-02-24 09:36:44 -05:00 committed by GitHub
commit 121011ebc0
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -5,8 +5,14 @@ sudo: required
language: go language: go
# make this also work for forks
go_import_path: github.com/kubernetes-incubator/kompose
go: go:
- 1.6 - 1.6
- 1.7
- 1.8
before_install: before_install:
- go get github.com/mattn/goveralls - go get github.com/mattn/goveralls

52
pkg/kobject/kobject.go
View File

@ -57,32 +57,32 @@ type ConvertOptions struct {
type ServiceConfig struct { type ServiceConfig struct {
// use tags to mark from what element this value comes // use tags to mark from what element this value comes
ContainerName string ContainerName string
Image string `compose:"image",bundle:"Image"` Image string `compose:"image" bundle:"Image"`
Environment []EnvVar `compose:"environment",bundle:"Env"` Environment []EnvVar `compose:"environment" bundle:"Env"`
Port []Ports `compose:"ports",bundle:"Ports"` Port []Ports `compose:"ports" bundle:"Ports"`
Command []string `compose:"command",bundle:"Command"` Command []string `compose:"command" bundle:"Command"`
WorkingDir string `compose:"",bundle:"WorkingDir"` WorkingDir string `compose:"" bundle:"WorkingDir"`
Args []string `compose:"args",bundle:"Args"` Args []string `compose:"args" bundle:"Args"`
Volumes []string `compose:"volumes",bundle:"Volumes"` Volumes []string `compose:"volumes" bundle:"Volumes"`
Network []string `compose:"network",bundle:"Networks"` Network []string `compose:"network" bundle:"Networks"`
Labels map[string]string `compose:"labels",bundle:"Labels"` Labels map[string]string `compose:"labels" bundle:"Labels"`
Annotations map[string]string `compose:"",bundle:""` Annotations map[string]string `compose:"" bundle:""`
CPUSet string `compose:"cpuset",bundle:""` CPUSet string `compose:"cpuset" bundle:""`
CPUShares int64 `compose:"cpu_shares",bundle:""` CPUShares int64 `compose:"cpu_shares" bundle:""`
CPUQuota int64 `compose:"cpu_quota",bundle:""` CPUQuota int64 `compose:"cpu_quota" bundle:""`
CapAdd []string `compose:"cap_add",bundle:""` CapAdd []string `compose:"cap_add" bundle:""`
CapDrop []string `compose:"cap_drop",bundle:""` CapDrop []string `compose:"cap_drop" bundle:""`
Expose []string `compose:"expose",bundle:""` Expose []string `compose:"expose" bundle:""`
Privileged bool `compose:"privileged",bundle:""` Privileged bool `compose:"privileged" bundle:""`
Restart string `compose:"restart",bundle:""` Restart string `compose:"restart" bundle:""`
User string `compose:"user",bundle:"User"` User string `compose:"user" bundle:"User"`
VolumesFrom []string `compose:"volumes_from",bundle:""` VolumesFrom []string `compose:"volumes_from" bundle:""`
ServiceType string `compose:"kompose.service.type",bundle:""` ServiceType string `compose:"kompose.service.type" bundle:""`
Build string `compose:"build",bundle:""` Build string `compose:"build" bundle:""`
ExposeService string `compose:"kompose.service.expose",bundle:""` ExposeService string `compose:"kompose.service.expose" bundle:""`
Stdin bool `compose:"stdin_open",bundle:""` Stdin bool `compose:"stdin_open" bundle:""`
Tty bool `compose:"tty",bundle:""` Tty bool `compose:"tty" bundle:""`
MemLimit yaml.MemStringorInt `compose:"mem_limit",bundle:""` MemLimit yaml.MemStringorInt `compose:"mem_limit" bundle:""`
} }
// EnvVar holds the environment variable struct of a container // EnvVar holds the environment variable struct of a container