upgraded docker version to 1.41

Author: igorrendulic

docker/docker.go

@@ -348,7 +348,7 @@ func (cl *Client) ContainerLogsStream(containerID string, output chan []byte, do
 func (cl *Client) ContainerCreate(name string, config *container.Config, hostConfig *container.HostConfig, networkConfig *network.NetworkingConfig) (*container.ContainerCreateCreatedBody, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
-	body, err := cl.client.ContainerCreate(ctx, config, hostConfig, networkConfig, name)
+	body, err := cl.client.ContainerCreate(ctx, config, hostConfig, networkConfig, nil, name)
 	if err != nil {
 		return nil, err
 	}
@@ -471,7 +471,7 @@ func (cl *Client) ImagePullDockerHub(image, tag string, username, password strin
 }
 
 // ImageRemove - removes an image by force and prunes its children
-func (cl *Client) ImageRemove(imageID string) ([]types.ImageDelete, error) {
+func (cl *Client) ImageRemove(imageID string) ([]types.ImageDeleteResponseItem, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
 	defer cancel()
 

docker/docker_interfaces.go

@@ -44,7 +44,7 @@ type Docker interface {
 	ContainerStats(containerID string) (*types.StatsJSON, error)
 	ImagesList() ([]types.ImageSummary, error)
 	ImagePullDockerHub(image, tag string, username, password string) (string, error)
-	ImageRemove(imageID string) ([]types.ImageDelete, error)
+	ImageRemove(imageID string) ([]types.ImageDeleteResponseItem, error)
 	VolumesPrune(pruneFilter filters.Args) (*types.VolumesPruneReport, error)
 	GetDockerClient() *client.Client
 	CalculateStats(jsonStats *types.StatsJSON) *models.Stats

docker/docker_test.go

@@ -118,6 +118,11 @@ func TestSystemWideInfo(t *testing.T) {
 	}
 }
 
+func TestDockerPullImage(t *testing.T) {
+	cl := NewSocketClient(Log(zl), Host("unix:///var/run/docker.sock"))
+	cl.ImagePullDockerHub("chryscloud/chrysedgeserver", "0.0.8-arm64v8", "", "")
+}
+
 //TODO: tests need to be modified to run without actual docker config
 // func TestSocketClient(t *testing.T) {
 // 	cl := NewSocketClient(Log(zl), Host("unix:///var/run/docker.sock"))

go.mod

@@ -5,26 +5,31 @@ go 1.13
 require (
 	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/blendle/zapdriver v1.3.1
+	github.com/containerd/containerd v1.4.3 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v1.13.1
+	github.com/docker/docker v20.10.3+incompatible
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-openapi/spec v0.19.9 // indirect
 	github.com/go-openapi/swag v0.19.9 // indirect
 	github.com/go-resty/resty/v2 v2.3.0
-	github.com/golang/protobuf v1.3.5 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.5.4 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/mailru/easyjson v0.7.2 // indirect
+	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/stretchr/testify v1.5.1 // indirect
+	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/swaggo/gin-swagger v1.2.0
 	github.com/swaggo/swag v1.6.7 // indirect
 	go.uber.org/zap v1.15.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
-	golang.org/x/tools v0.0.0-20200804234916-fec4f28ebb08 // indirect
+	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
+	google.golang.org/grpc v1.35.0 // indirect
 	gopkg.in/go-playground/assert.v1 v1.2.1
 	gopkg.in/yaml.v2 v2.3.0
+	gotest.tools/v3 v3.0.3 // indirect
 )