mleku/indra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patching merge conflict.

Browse Source
This commit is contained in:
Colin Lyons
2022-12-28 12:29:14 +00:00
parent 0926f1c2a5
commit a64d8bb40a
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docker/sim/client.go
View File

@@ -3,7 +3,6 @@
package main package main
import ( import (
<<<<<<<< HEAD:docker/sim/client.go
"bytes" "bytes"
"context" "context"
"encoding/base64" "encoding/base64"
@@ -131,16 +130,3 @@ func (cli *Client) PushTags(opts types.ImagePushOptions) (err error) {
return nil return nil
} }
========
"github.com/docker/docker/client"
)
func createNetworkIfNotExists(cli *client.Client) (err error) {
//ctx, cancel := context.WithTimeout(context.Background(), time.Second * 120)
//defer cancel()
//cli.NetworkCreate(ctx, "indranet")
return
}
>>>>>>>> main:docker/sim/utils.go