fix sealos will not use local images if there is a newer one remote (#…

…1689) [fix]only support buildah sdk Signed-off-by: yyf1986 <[email protected]> * [fix]only support buildah sdk,delete binary support code Signed-off-by: yyf1986 <[email protected]> Signed-off-by: yyf1986 <[email protected]> Co-authored-by: yyf1986 <[email protected]>
labring · Sep 5, 2022 · 617e877 · 617e877
1 parent 6f222ca
commit 617e877
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 342 deletions.
diff --git a/pkg/image/binary/cluster.go b/pkg/image/binary/cluster.go
diff --git a/pkg/image/binary/image.go b/pkg/image/binary/image.go
diff --git a/pkg/image/binary/registry.go b/pkg/image/binary/registry.go
diff --git a/pkg/image/buildah.go b/pkg/image/buildah.go
@@ -19,25 +19,24 @@ package image
 import (
 	"github.com/pkg/errors"
 
-	"github.com/labring/sealos/pkg/utils/exec"
 	fileutil "github.com/labring/sealos/pkg/utils/file"
 )
 
-func initBuildah() (bool, error) {
+func initBuildah() error {
 	err := buildahPolicySync()
 	if err != nil {
-		return false, errors.New("create policy.json failed")
+		return errors.New("create policy.json failed")
 	}
 	err = buildahStorageSync()
 	if err != nil {
-		return false, errors.New("create storage config failed")
+		return errors.New("create storage config failed")
 	}
 	err = buildahRegistrySync()
 	if err != nil {
-		return false, errors.New("create registry config failed")
+		return errors.New("create registry config failed")
 	}
-	_, ok := exec.CheckCmdIsExist("buildah")
-	return ok, nil
+	//_, ok := exec.CheckCmdIsExist("buildah")
+	return nil
 }
 
 func buildahPolicySync() error {

diff --git a/pkg/image/buildah/registry/pull.go b/pkg/image/buildah/registry/pull.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/containers/buildah"
 	"github.com/containers/buildah/define"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/containers/common/pkg/auth"
 	"github.com/pkg/errors"
 )
@@ -64,7 +65,7 @@ func (*Service) Pull(images ...string) error {
 		return err
 	}
 
-	systemContext, _ := getSystemContext(opt.tlsVerify)
+	systemContext, _ := parse.SystemContextFromOptions(getCmdFlag())
 
 	decConfig, err := getDecryptConfig(opt.decryptionKeys)
 	if err != nil {