Do not hardcode "amd64" on LCOW and Windows-related files

Fixes #3281.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato 2020-11-09 13:38:47 -08:00
parent 293b08dd19
commit bb8aac38a0
3 changed files with 7 additions and 3 deletions

View File

@ -24,6 +24,7 @@ import (
"io/ioutil"
"os"
"path"
"runtime"
"time"
"github.com/Microsoft/go-winio/pkg/security"
@ -61,7 +62,7 @@ func init() {
ic.Meta.Platforms = append(ic.Meta.Platforms, ocispec.Platform{
OS: "linux",
Architecture: "amd64",
Architecture: runtime.GOARCH,
})
return NewWindowsLcowDiff(md.(*metadata.DB).ContentStore())
},

View File

@ -19,6 +19,8 @@
package platforms
import (
"runtime"
specs "github.com/opencontainers/image-spec/specs-go/v1"
)
@ -26,6 +28,6 @@ import (
func Default() MatchComparer {
return Ordered(DefaultSpec(), specs.Platform{
OS: "linux",
Architecture: "amd64",
Architecture: runtime.GOARCH,
})
}

View File

@ -25,6 +25,7 @@ import (
"io"
"os"
"path/filepath"
"runtime"
"strconv"
"strings"
"sync"
@ -50,7 +51,7 @@ func init() {
InitFn: func(ic *plugin.InitContext) (interface{}, error) {
ic.Meta.Platforms = append(ic.Meta.Platforms, ocispec.Platform{
OS: "linux",
Architecture: "amd64",
Architecture: runtime.GOARCH,
})
return NewSnapshotter(ic.Root)
},