|
|
@ -4,6 +4,7 @@ import (
|
|
|
|
"bytes"
|
|
|
|
"bytes"
|
|
|
|
"fmt"
|
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"io/ioutil"
|
|
|
|
|
|
|
|
"os"
|
|
|
|
"strings"
|
|
|
|
"strings"
|
|
|
|
"time"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
|
|
|
@ -227,6 +228,15 @@ func (client dockerClient) StartContainer(c Container) (t.ContainerID, error) {
|
|
|
|
|
|
|
|
|
|
|
|
name := c.Name()
|
|
|
|
name := c.Name()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// detect podman
|
|
|
|
|
|
|
|
// podman makes /run/.containerenv, docker makes /run/.dockerenv
|
|
|
|
|
|
|
|
_, err := os.Stat("/run/.containerenv")
|
|
|
|
|
|
|
|
if err == nil {
|
|
|
|
|
|
|
|
// podman workaround
|
|
|
|
|
|
|
|
name = name[1:]
|
|
|
|
|
|
|
|
hostConfig.Ulimits = nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
log.Infof("Creating %s", name)
|
|
|
|
log.Infof("Creating %s", name)
|
|
|
|
createdContainer, err := client.api.ContainerCreate(bg, config, hostConfig, simpleNetworkConfig, nil, name)
|
|
|
|
createdContainer, err := client.api.ContainerCreate(bg, config, hostConfig, simpleNetworkConfig, nil, name)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|