소스 검색

Merge pull request #19033 from cr7pt0gr4ph7/19032-fix-native-execdriver-compile-error

Fix declarations of of execdriver/native.NewDriver to have the same signature for all platforms
Brian Goff 9 년 전
부모
커밋
0fff66977a
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      daemon/execdriver/native/driver_unsupported.go
  2. 1 1
      daemon/execdriver/native/driver_unsupported_nocgo.go

+ 1 - 1
daemon/execdriver/native/driver_unsupported.go

@@ -9,6 +9,6 @@ import (
 )
 
 // NewDriver returns a new native driver, called from NewDriver of execdriver.
-func NewDriver(root, initPath string) (execdriver.Driver, error) {
+func NewDriver(root string, options []string) (execdriver.Driver, error) {
 	return nil, fmt.Errorf("native driver not supported on non-linux")
 }

+ 1 - 1
daemon/execdriver/native/driver_unsupported_nocgo.go

@@ -9,6 +9,6 @@ import (
 )
 
 // NewDriver returns a new native driver, called from NewDriver of execdriver.
-func NewDriver(root, initPath string) (execdriver.Driver, error) {
+func NewDriver(root string, options []string) (execdriver.Driver, error) {
 	return nil, fmt.Errorf("native driver not supported on non-linux")
 }