Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package cmd
import (
"os"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"gitlab.com/bootc-org/podman-bootc/pkg/vm"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/vm"

"github.com/containers/common/pkg/report"
"github.com/sirupsen/logrus"
Expand Down
8 changes: 4 additions & 4 deletions cmd/rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"os"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"gitlab.com/bootc-org/podman-bootc/pkg/vm"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/vm"

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"os"

"gitlab.com/bootc-org/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/user"

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
10 changes: 5 additions & 5 deletions cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"sync"
"time"

"gitlab.com/bootc-org/podman-bootc/pkg/bootc"
"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"gitlab.com/bootc-org/podman-bootc/pkg/vm"
"github.com/containers/podman-bootc/pkg/bootc"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/vm"

"github.com/containers/podman/v5/pkg/bindings"
"github.com/sirupsen/logrus"
Expand Down
8 changes: 4 additions & 4 deletions cmd/ssh.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package cmd

import (
"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"gitlab.com/bootc-org/podman-bootc/pkg/vm"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/vm"

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
8 changes: 4 additions & 4 deletions cmd/stop.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package cmd

import (
"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"gitlab.com/bootc-org/podman-bootc/pkg/vm"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/vm"

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module gitlab.com/bootc-org/podman-bootc
module github.com/containers/podman-bootc

go 1.20

Expand Down
6 changes: 3 additions & 3 deletions pkg/bootc/bootc_disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"syscall"
"time"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"

"github.com/containers/podman/v5/pkg/bindings/containers"
"github.com/containers/podman/v5/pkg/bindings/images"
Expand Down
2 changes: 1 addition & 1 deletion pkg/credentials/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os/exec"
"path/filepath"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/config"
)

// Generatekeys creates an ed25519 set of keys
Expand Down
2 changes: 1 addition & 1 deletion pkg/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strconv"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/config"

"github.com/adrg/xdg"
"github.com/containers/podman/v5/pkg/rootless"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/podman.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os/exec"
"strings"

"gitlab.com/bootc-org/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/user"

"github.com/containers/podman/v5/pkg/machine"
"github.com/containers/podman/v5/pkg/machine/define"
Expand Down
2 changes: 1 addition & 1 deletion pkg/vm/cloudinit.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os/exec"
"path/filepath"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/config"
)

func (b *BootcVMCommon) ParseCloudInit() (err error) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/vm/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"strings"
"time"

"gitlab.com/bootc-org/podman-bootc/pkg/bootc"
"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/bootc"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"

"github.com/docker/go-units"
"github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions pkg/vm/vm_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"path/filepath"
"time"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/utils"

"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/vm/vm_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"text/template"
"time"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/config"

"github.com/sirupsen/logrus"
"libvirt.org/go/libvirt"
Expand Down
10 changes: 5 additions & 5 deletions pkg/vm/vm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"testing"
"time"

"gitlab.com/bootc-org/podman-bootc/cmd"
"gitlab.com/bootc-org/podman-bootc/pkg/bootc"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"gitlab.com/bootc-org/podman-bootc/pkg/vm"
"github.com/containers/podman-bootc/cmd"
"github.com/containers/podman-bootc/pkg/bootc"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/vm"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
8 changes: 4 additions & 4 deletions podman-bootc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"os/signal"
"syscall"

"gitlab.com/bootc-org/podman-bootc/cmd"
"gitlab.com/bootc-org/podman-bootc/pkg/bootc"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/cmd"
"github.com/containers/podman-bootc/pkg/bootc"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"

"github.com/containers/podman/v5/pkg/bindings"
"github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"sync"
"testing"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/test/e2e"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/test/e2e"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"

"gitlab.com/bootc-org/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/user"
)

const DefaultBaseImage = "quay.io/centos-bootc/centos-bootc-dev:stream9"
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/e2e_utils_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package e2e
import (
"path/filepath"

"gitlab.com/bootc-org/podman-bootc/pkg/config"
"gitlab.com/bootc-org/podman-bootc/pkg/user"
"gitlab.com/bootc-org/podman-bootc/pkg/utils"
"gitlab.com/bootc-org/podman-bootc/pkg/vm"
"github.com/containers/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/user"
"github.com/containers/podman-bootc/pkg/utils"
"github.com/containers/podman-bootc/pkg/vm"
)

func pidFilePath(id string) (pidFilePath string, err error) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_utils_linux.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package e2e

import (
"gitlab.com/bootc-org/podman-bootc/pkg/config"
"github.com/containers/podman-bootc/pkg/config"

"libvirt.org/go/libvirt"
)
Expand Down