File tree Expand file tree Collapse file tree 8 files changed +19
-19
lines changed Expand file tree Collapse file tree 8 files changed +19
-19
lines changed Original file line number Diff line number Diff line change @@ -3,12 +3,12 @@ package cmd
3
3
import (
4
4
"fmt"
5
5
"os"
6
+
6
7
"podman-bootc/pkg/config"
7
8
"podman-bootc/pkg/user"
8
9
"podman-bootc/pkg/vm"
9
10
10
11
"github.com/sirupsen/logrus"
11
-
12
12
"github.com/spf13/cobra"
13
13
)
14
14
Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ import (
12
12
"time"
13
13
14
14
"podman-bootc/pkg/config"
15
-
16
15
"podman-bootc/pkg/user"
17
16
18
17
"github.com/containers/podman/v5/pkg/bindings/containers"
Original file line number Diff line number Diff line change @@ -5,9 +5,10 @@ import (
5
5
"os"
6
6
"os/user"
7
7
"path/filepath"
8
- "podman-bootc/pkg/config"
9
8
"strconv"
10
9
10
+ "podman-bootc/pkg/config"
11
+
11
12
"github.com/adrg/xdg"
12
13
"github.com/containers/podman/v5/pkg/rootless"
13
14
)
@@ -63,7 +64,6 @@ func (u *User) RunDir() string {
63
64
return filepath .Join (xdg .RuntimeDir , config .ProjectName , "run" )
64
65
}
65
66
66
-
67
67
func (u * User ) InitOSCDirs () error {
68
68
if err := os .MkdirAll (u .ConfigDir (), os .ModePerm ); err != nil {
69
69
return err
Original file line number Diff line number Diff line change @@ -5,9 +5,10 @@ import (
5
5
"errors"
6
6
"fmt"
7
7
"os/exec"
8
- "podman-bootc/pkg/user"
9
8
"strings"
10
9
10
+ "podman-bootc/pkg/user"
11
+
11
12
"github.com/containers/podman/v5/pkg/machine"
12
13
"github.com/containers/podman/v5/pkg/machine/define"
13
14
"github.com/containers/podman/v5/pkg/machine/env"
Original file line number Diff line number Diff line change @@ -7,13 +7,14 @@ import (
7
7
"os"
8
8
"os/exec"
9
9
"path/filepath"
10
- "podman-bootc/pkg/bootc"
11
- "podman-bootc/pkg/config"
12
- "podman-bootc/pkg/user"
13
10
"strconv"
14
11
"strings"
15
12
"time"
16
13
14
+ "podman-bootc/pkg/bootc"
15
+ "podman-bootc/pkg/config"
16
+ "podman-bootc/pkg/user"
17
+
17
18
"github.com/docker/go-units"
18
19
"github.com/sirupsen/logrus"
19
20
"golang.org/x/crypto/ssh"
@@ -71,7 +72,7 @@ type BootcVM interface {
71
72
Exists () (bool , error )
72
73
GetConfig () (* BootcVMConfig , error )
73
74
CloseConnection ()
74
- PrintConsole () ( error )
75
+ PrintConsole () error
75
76
}
76
77
77
78
type BootcVMCommon struct {
Original file line number Diff line number Diff line change @@ -6,11 +6,12 @@ import (
6
6
"errors"
7
7
"fmt"
8
8
"path/filepath"
9
- "podman-bootc/pkg/config"
10
9
"strconv"
11
10
"text/template"
12
11
"time"
13
12
13
+ "podman-bootc/pkg/config"
14
+
14
15
"github.com/sirupsen/logrus"
15
16
"libvirt.org/go/libvirt"
16
17
)
@@ -19,8 +20,8 @@ import (
19
20
var domainTemplate string
20
21
21
22
type BootcVMLinux struct {
22
- domain * libvirt.Domain
23
- libvirtUri string
23
+ domain * libvirt.Domain
24
+ libvirtUri string
24
25
libvirtConnection * libvirt.Connect
25
26
BootcVMCommon
26
27
}
Original file line number Diff line number Diff line change @@ -5,18 +5,17 @@ import (
5
5
"os"
6
6
osUser "os/user"
7
7
"path/filepath"
8
- "podman-bootc/cmd"
9
- "podman-bootc/pkg/bootc"
10
- "podman-bootc/pkg/user"
11
8
"testing"
12
9
"time"
13
10
11
+ "podman-bootc/cmd"
12
+ "podman-bootc/pkg/bootc"
13
+ "podman-bootc/pkg/user"
14
14
"podman-bootc/pkg/vm"
15
15
16
- "libvirt.org/go/libvirt"
17
-
18
16
. "github.com/onsi/ginkgo/v2"
19
17
. "github.com/onsi/gomega"
18
+ "libvirt.org/go/libvirt"
20
19
)
21
20
22
21
func TestPodmanBootc (t * testing.T ) {
Original file line number Diff line number Diff line change 9
9
10
10
"podman-bootc/cmd"
11
11
"podman-bootc/pkg/bootc"
12
- "podman-bootc/pkg/utils"
13
-
14
12
"podman-bootc/pkg/user"
13
+ "podman-bootc/pkg/utils"
15
14
16
15
"github.com/containers/podman/v5/pkg/bindings"
17
16
"github.com/sirupsen/logrus"
You can’t perform that action at this time.
0 commit comments