github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-21 21:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove vexp from vendoring process

Browse Source
This commit is contained in:
Brad Rydzewski
2016-03-07 11:23:49 -08:00
parent df39f21d15
commit b5dcfc4edd
649 changed files with 20512 additions and 307521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/docker/docker.go
View File

@@ -38,14 +38,14 @@ func Run(client dockerclient.Client, conf *dockerclient.ContainerConfig, name st
func RunDaemon(client dockerclient.Client, conf *dockerclient.ContainerConfig, name string) (*dockerclient.ContainerInfo, error) {
// attempts to create the contianer
id, err := client.CreateContainer(conf, name)
id, err := client.CreateContainer(conf, name, nil)
if err != nil {
// and pull the image and re-create if that fails
err = client.PullImage(conf.Image, nil)
if err != nil {
return nil, err
}
id, err = client.CreateContainer(conf, name)
id, err = client.CreateContainer(conf, name, nil)
if err != nil {
client.RemoveContainer(id, true, true)
return nil, err