Changing all containers to use pointer receiver since they are sharing around a single pointer inside the struct, I want to convey to users that the data is all being shared by a pointer.
This commit is contained in:
parent
5836ede37b
commit
e00e0a0492
1 changed files with 23 additions and 14 deletions
37
container.go
37
container.go
|
@ -22,28 +22,24 @@ type Container interface {
|
||||||
Build() *aurora.Container
|
Build() *aurora.Container
|
||||||
}
|
}
|
||||||
|
|
||||||
type MesosContainer struct {
|
|
||||||
container *aurora.MesosContainer
|
|
||||||
}
|
|
||||||
|
|
||||||
type DockerContainer struct {
|
type DockerContainer struct {
|
||||||
container *aurora.DockerContainer
|
container *aurora.DockerContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDockerContainer() DockerContainer {
|
func NewDockerContainer() *DockerContainer {
|
||||||
return DockerContainer{container: aurora.NewDockerContainer()}
|
return &DockerContainer{container: aurora.NewDockerContainer()}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c DockerContainer) Build() *aurora.Container {
|
func (c *DockerContainer) Build() *aurora.Container {
|
||||||
return &aurora.Container{Docker: c.container}
|
return &aurora.Container{Docker: c.container}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c DockerContainer) Image(image string) DockerContainer {
|
func (c *DockerContainer) Image(image string) *DockerContainer {
|
||||||
c.container.Image = image
|
c.container.Image = image
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c DockerContainer) AddParameter(name, value string) DockerContainer {
|
func (c *DockerContainer) AddParameter(name, value string) *DockerContainer {
|
||||||
c.container.Parameters = append(c.container.Parameters, &aurora.DockerParameter{
|
c.container.Parameters = append(c.container.Parameters, &aurora.DockerParameter{
|
||||||
Name: name,
|
Name: name,
|
||||||
Value: value,
|
Value: value,
|
||||||
|
@ -51,15 +47,19 @@ func (c DockerContainer) AddParameter(name, value string) DockerContainer {
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewMesosContainer() MesosContainer {
|
type MesosContainer struct {
|
||||||
return MesosContainer{container: aurora.NewMesosContainer()}
|
container *aurora.MesosContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c MesosContainer) Build() *aurora.Container {
|
func NewMesosContainer() *MesosContainer {
|
||||||
|
return &MesosContainer{container: aurora.NewMesosContainer()}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *MesosContainer) Build() *aurora.Container {
|
||||||
return &aurora.Container{Mesos: c.container}
|
return &aurora.Container{Mesos: c.container}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c MesosContainer) DockerImage(name, tag string) MesosContainer {
|
func (c *MesosContainer) DockerImage(name, tag string) *MesosContainer {
|
||||||
if c.container.Image == nil {
|
if c.container.Image == nil {
|
||||||
c.container.Image = aurora.NewImage()
|
c.container.Image = aurora.NewImage()
|
||||||
}
|
}
|
||||||
|
@ -68,7 +68,7 @@ func (c MesosContainer) DockerImage(name, tag string) MesosContainer {
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c MesosContainer) AppcImage(name, imageId string) MesosContainer {
|
func (c *MesosContainer) AppcImage(name, imageId string) *MesosContainer {
|
||||||
if c.container.Image == nil {
|
if c.container.Image == nil {
|
||||||
c.container.Image = aurora.NewImage()
|
c.container.Image = aurora.NewImage()
|
||||||
}
|
}
|
||||||
|
@ -76,3 +76,12 @@ func (c MesosContainer) AppcImage(name, imageId string) MesosContainer {
|
||||||
c.container.Image.Appc = &aurora.AppcImage{Name: name, ImageId: imageId}
|
c.container.Image.Appc = &aurora.AppcImage{Name: name, ImageId: imageId}
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *MesosContainer) AddVolume(hostPath, containerPath string, mode aurora.Mode) *MesosContainer {
|
||||||
|
c.container.Volumes = append(c.container.Volumes, &aurora.Volume{
|
||||||
|
HostPath: hostPath,
|
||||||
|
ContainerPath: containerPath,
|
||||||
|
Mode: mode})
|
||||||
|
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue