Compare commits
2 Commits
v0.4.1
...
v0.3.0-rc1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
214063f172 | ||
|
|
1edb88f306 |
@@ -116,7 +116,7 @@ func ApplyNetworkConfigs(netCfg *config.NetworkConfig) error {
|
||||
func applyNetConf(link netlink.Link, netConf config.InterfaceConfig) error {
|
||||
if netConf.DHCP {
|
||||
log.Infof("Running DHCP on %s", link.Attrs().Name)
|
||||
cmd := exec.Command("dhcpcd", "-A4", link.Attrs().Name)
|
||||
cmd := exec.Command("dhcpcd", "-A4H", link.Attrs().Name)
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
if err := cmd.Run(); err != nil {
|
||||
|
||||
@@ -36,16 +36,14 @@ func (c *containerBasedService) Up() error {
|
||||
create = true
|
||||
}
|
||||
|
||||
var event project.Event
|
||||
|
||||
if create {
|
||||
container.Create()
|
||||
c.project.Notify(project.CONTAINER_CREATED, c, map[string]string{
|
||||
project.CONTAINER_ID: container.Container.ID,
|
||||
})
|
||||
event = project.CONTAINER_CREATED
|
||||
} else {
|
||||
container.StartAndWait()
|
||||
c.project.Notify(project.CONTAINER_STARTED, c, map[string]string{
|
||||
project.CONTAINER_ID: container.Container.ID,
|
||||
})
|
||||
event = project.CONTAINER_STARTED
|
||||
}
|
||||
|
||||
if container.Err != nil {
|
||||
@@ -56,6 +54,12 @@ func (c *containerBasedService) Up() error {
|
||||
return project.ErrRestart
|
||||
}
|
||||
|
||||
if container.Container != nil {
|
||||
c.project.Notify(event, c, map[string]string{
|
||||
project.CONTAINER_ID: container.Container.ID,
|
||||
})
|
||||
}
|
||||
|
||||
return container.Err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user