update docker client api

Author: pfandzelter

.gitignore

@@ -1,9 +1,8 @@
 tinyfaas-*
 cmd/manager/rproxy-*.bin
 tmp/
-
-# Created by https://www.toptal.com/developers/gitignore/api/go,node,python,visualstudiocode,macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=go,node,python,visualstudiocode,macos
+# Created by https://www.toptal.com/developers/gitignore/api/go,node,macos,python,visualstudiocode,intellij
+# Edit at https://www.toptal.com/developers/gitignore?templates=go,node,macos,python,visualstudiocode,intellij
 
 ### Go ###
 # If you prefer the allow list template instead of the deny list, see community template:
@@ -28,6 +27,119 @@ tmp/
 # Go workspace file
 go.work
 
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+# https://plugins.jetbrains.com/plugin/7973-sonarlint
+.idea/**/sonarlint/
+
+# SonarQube Plugin
+# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
+.idea/**/sonarIssues.xml
+
+# Markdown Navigator plugin
+# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator-enh.xml
+.idea/**/markdown-navigator/
+
+# Cache file creation bug
+# See https://youtrack.jetbrains.com/issue/JBR-2257
+.idea/$CACHE_FILE$
+
+# CodeStream plugin
+# https://plugins.jetbrains.com/plugin/12206-codestream
+.idea/codestream.xml
+
+# Azure Toolkit for IntelliJ plugin
+# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
+.idea/**/azureSettings.xml
+
 ### macOS ###
 # General
 .DS_Store
@@ -388,4 +500,4 @@ pyrightconfig.json
 .history
 .ionide
 
-# End of https://www.toptal.com/developers/gitignore/api/go,node,python,visualstudiocode,macos
+# End of https://www.toptal.com/developers/gitignore/api/go,node,macos,python,visualstudiocode,intellij

pkg/docker/handler.go

@@ -13,14 +13,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/OpenFogStack/tinyFaaS/pkg/manager"
-	"github.com/OpenFogStack/tinyFaaS/pkg/util"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/google/uuid"
+
+	"github.com/OpenFogStack/tinyFaaS/pkg/manager"
+	"github.com/OpenFogStack/tinyFaaS/pkg/util"
 )
 
 const (
@@ -227,13 +228,13 @@ func (dh *dockerHandler) Start() error {
 	// docker start <container>
 
 	wg := sync.WaitGroup{}
-	for _, container := range dh.containers {
+	for _, c := range dh.containers {
 		wg.Add(1)
 		go func(c string) {
 			err := dh.client.ContainerStart(
 				context.Background(),
 				c,
-				types.ContainerStartOptions{},
+				container.StartOptions{},
 			)
 			wg.Done()
 			if err != nil {
@@ -242,7 +243,7 @@ func (dh *dockerHandler) Start() error {
 			}
 
 			log.Println("started container", c)
-		}(container)
+		}(c)
 	}
 	wg.Wait()
 
@@ -329,7 +330,7 @@ func (dh *dockerHandler) Destroy() error {
 			err = dh.client.ContainerRemove(
 				context.Background(),
 				c,
-				types.ContainerRemoveOptions{},
+				container.RemoveOptions{},
 			)
 			wg.Done()
 			if err != nil {
@@ -374,11 +375,11 @@ func (dh *dockerHandler) Logs() (io.Reader, error) {
 	// get container logs
 	// docker logs <container>
 	var logs bytes.Buffer
-	for _, container := range dh.containers {
+	for _, c := range dh.containers {
 		l, err := dh.client.ContainerLogs(
 			context.Background(),
-			container,
-			types.ContainerLogsOptions{
+			c,
+			container.LogsOptions{
 				ShowStdout: true,
 				ShowStderr: true,
 				Timestamps: true,
@@ -404,7 +405,7 @@ func (dh *dockerHandler) Logs() (io.Reader, error) {
 		scanner := bufio.NewScanner(&lstdout)
 
 		for scanner.Scan() {
-			logs.WriteString(fmt.Sprintf("function=%s handler=%s %s\n", dh.name, container, scanner.Text()))
+			logs.WriteString(fmt.Sprintf("function=%s handler=%s %s\n", dh.name, c, scanner.Text()))
 		}
 
 		if err := scanner.Err(); err != nil {