@@ -10,28 +10,16 @@ import (
10
10
11
11
"github.com/abiosoft/colima/cli"
12
12
"github.com/abiosoft/colima/environment"
13
- "github.com/abiosoft/colima/util/downloader"
14
13
"github.com/coreos/go-semver/semver"
15
14
)
16
15
17
- const (
18
- version = "v0.7.6" // version of colima-core to use.
19
- limaVersion = "v0.18.0" // minimum Lima version supported
20
- baseURL = "https://github.com/abiosoft/colima-core/releases/download/" + version + "/"
21
- )
16
+ const limaVersion = "v0.18.0" // minimum Lima version supported
22
17
23
18
type (
24
19
hostActions = environment.HostActions
25
20
guestActions = environment.GuestActions
26
21
)
27
22
28
- func downloadSha (url string ) * downloader.SHA {
29
- return & downloader.SHA {
30
- Size : 512 ,
31
- URL : url + ".sha512sum" ,
32
- }
33
- }
34
-
35
23
// SetupBinfmt downloads and install binfmt
36
24
func SetupBinfmt (host hostActions , guest guestActions , arch environment.Arch ) error {
37
25
qemuArch := environment .AARCH64
@@ -46,29 +34,9 @@ func SetupBinfmt(host hostActions, guest guestActions, arch environment.Arch) er
46
34
return nil
47
35
}
48
36
49
- // ignore download and extract if previously installed
50
- if err := guest .RunQuiet ("command" , "-v" , "binfmt" ); err == nil {
51
- return install ()
52
- }
53
-
54
- // download
55
- url := baseURL + "binfmt-" + arch .Value ().GoArch () + ".tar.gz"
56
- dest := "/tmp/binfmt.tar.gz"
57
- if err := downloader .DownloadToGuest (host , guest , downloader.Request {
58
- URL : url ,
59
- SHA : downloadSha (url ),
60
- }, dest ); err != nil {
61
- return fmt .Errorf ("error downloading binfmt: %w" , err )
62
- }
63
-
64
- // extract
65
- if err := guest .Run ("sh" , "-c" ,
66
- strings .NewReplacer (
67
- "{file}" , dest ,
68
- "{qemu_arch}" , string (qemuArch ),
69
- ).Replace (`cd /tmp && tar xfz {file} && sudo chown root:root binfmt qemu-{qemu_arch} && sudo mv binfmt qemu-{qemu_arch} /usr/bin` ),
70
- ); err != nil {
71
- return fmt .Errorf ("error extracting binfmt: %w" , err )
37
+ // validate binfmt
38
+ if err := guest .RunQuiet ("command" , "-v" , "binfmt" ); err != nil {
39
+ return fmt .Errorf ("binfmt not found: %w" , err )
72
40
}
73
41
74
42
return install ()
0 commit comments