rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-30 21:26:09 +00:00
Code Issues Releases Wiki Activity

Updates for refactored rancher-compose

Browse Source
This commit is contained in:
Darren Shepherd 2015-05-05 13:36:52 -07:00
parent fdc9463e4c
commit 6b929abdea
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -5,7 +5,7 @@ import (
"os"
"strings"
"github.com/rancherio/rancher-compose/project"
"github.com/rancherio/rancher-compose/librcompose/project"
log "github.com/Sirupsen/logrus"
"github.com/rancherio/os/util"

2
config/default.go
View File

@ -1,7 +1,7 @@
package config
import (
"github.com/rancherio/rancher-compose/project"
"github.com/rancherio/rancher-compose/librcompose/project"
)
func NewConfig() *Config {

2
config/types.go
View File

@ -1,6 +1,6 @@
package config
import "github.com/rancherio/rancher-compose/project"
import "github.com/rancherio/rancher-compose/librcompose/project"
const (
DEFAULT_IMAGE_VERSION = "v0.3.0-rc2"

4
docker/container.go
View File

@ -18,8 +18,8 @@ import (
dockerClient "github.com/fsouza/go-dockerclient"
"github.com/rancherio/os/config"
"github.com/rancherio/os/util"
"github.com/rancherio/rancher-compose/docker"
"github.com/rancherio/rancher-compose/project"
"github.com/rancherio/rancher-compose/librcompose/docker"
"github.com/rancherio/rancher-compose/librcompose/project"
)
type Container struct {

6
docker/factory.go
View File

@ -5,7 +5,7 @@ import (
"github.com/rancherio/os/config"
"github.com/rancherio/os/util"
"github.com/rancherio/rancher-compose/project"
"github.com/rancherio/rancher-compose/librcompose/project"
)
type ContainerFactory struct {
@ -39,7 +39,7 @@ func (c *containerBasedService) Up() error {
var event project.Event
c.project.Notify(project.CONTAINER_STARTING, c, map[string]string{})
c.project.Notify(project.CONTAINER_STARTING, c.name, map[string]string{})
if fakeCreate {
event = project.CONTAINER_CREATED
@ -60,7 +60,7 @@ func (c *containerBasedService) Up() error {
}
if container.Container != nil {
c.project.Notify(event, c, map[string]string{
c.project.Notify(event, c.name, map[string]string{
project.CONTAINER_ID: container.Container.ID,
})
}

4
docker/services.go
View File

@ -7,7 +7,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/rancherio/os/config"
"github.com/rancherio/os/util"
"github.com/rancherio/rancher-compose/project"
"github.com/rancherio/rancher-compose/librcompose/project"
)
type configEnvironment struct {
@ -117,7 +117,7 @@ func RunServices(name string, cfg *config.Config, configs map[string]*project.Se
go func() {
for event := range projectEvents {
if event.Event == project.CONTAINER_STARTED && event.Service.Name() == "network" {
if event.Event == project.CONTAINER_STARTED && event.ServiceName == "network" {
network = true
}
}

2
init/bootstrap.go
View File

@ -10,7 +10,7 @@ import (
"github.com/rancherio/os/config"
"github.com/rancherio/os/docker"
"github.com/rancherio/os/util"
"github.com/rancherio/rancher-compose/project"
"github.com/rancherio/rancher-compose/librcompose/project"
)
const boot2dockerMagic = "boot2docker, please format-me"