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
2 changes: 1 addition & 1 deletion distrobuilder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ import (
"strings"
"time"

incus "github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/shared/util"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"
Expand Down
4 changes: 2 additions & 2 deletions distrobuilder/main_incus.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"path/filepath"
"slices"

client "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/shared/api"
client "github.com/lxc/incus/v7/client"
"github.com/lxc/incus/v7/shared/api"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion distrobuilder/main_repack-windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"strings"

"github.com/flosch/pongo2/v4"
incus "github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/shared/util"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion distrobuilder/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strconv"
"strings"

incus "github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/shared/util"
"golang.org/x/sys/unix"

"github.com/lxc/distrobuilder/v3/shared"
Expand Down
4 changes: 2 additions & 2 deletions generators/cloud-init.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"slices"
"strings"

"github.com/lxc/incus/v6/shared/api"
incus "github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
incus "github.com/lxc/incus/v7/shared/util"

"github.com/lxc/distrobuilder/v3/image"
"github.com/lxc/distrobuilder/v3/shared"
Expand Down
2 changes: 1 addition & 1 deletion generators/cloud-init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"testing"

incus "github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/shared/util"
"github.com/stretchr/testify/require"

"github.com/lxc/distrobuilder/v3/image"
Expand Down
2 changes: 1 addition & 1 deletion generators/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/util"

"github.com/lxc/distrobuilder/v3/image"
"github.com/lxc/distrobuilder/v3/shared"
Expand Down
4 changes: 2 additions & 2 deletions generators/hostname.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

"github.com/lxc/incus/v6/shared/api"
incus "github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
incus "github.com/lxc/incus/v7/shared/util"

"github.com/lxc/distrobuilder/v3/image"
"github.com/lxc/distrobuilder/v3/shared"
Expand Down
4 changes: 2 additions & 2 deletions generators/hosts.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path/filepath"
"strings"

"github.com/lxc/incus/v6/shared/api"
incus "github.com/lxc/incus/v6/shared/util"
"github.com/lxc/incus/v7/shared/api"
incus "github.com/lxc/incus/v7/shared/util"

"github.com/lxc/distrobuilder/v3/image"
"github.com/lxc/distrobuilder/v3/shared"
Expand Down
2 changes: 1 addition & 1 deletion generators/incus-agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"

incus "github.com/lxc/incus/v6/shared/util"
incus "github.com/lxc/incus/v7/shared/util"

"github.com/lxc/distrobuilder/v3/image"
"github.com/lxc/distrobuilder/v3/shared"
Expand Down
2 changes: 1 addition & 1 deletion generators/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/flosch/pongo2/v4"
"github.com/lxc/incus/v6/shared/api"
"github.com/lxc/incus/v7/shared/api"

"github.com/lxc/distrobuilder/v3/image"
"github.com/lxc/distrobuilder/v3/shared"
Expand Down
41 changes: 21 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ require (
github.com/antchfx/htmlquery v1.3.5
github.com/flosch/pongo2/v4 v4.0.2
github.com/google/go-github/v56 v56.0.0
github.com/lxc/incus/v6 v6.21.0
github.com/lxc/incus/v7 v7.0.0
github.com/opencontainers/image-spec v1.1.1
github.com/opencontainers/umoci v0.6.1-0.20251213054154-70fc5ee1f4df
github.com/sirupsen/logrus v1.9.4
github.com/spf13/cobra v1.10.2
github.com/stretchr/testify v1.11.1
go.podman.io/image/v5 v5.39.1
golang.org/x/sys v0.41.0
golang.org/x/text v0.34.0
golang.org/x/sys v0.43.0
golang.org/x/text v0.36.0
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -35,7 +35,7 @@ require (
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/platforms v1.0.0-rc.4 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.18.2 // indirect
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
github.com/containers/ocicrypt v1.2.1 // indirect
Expand All @@ -51,7 +51,7 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/flosch/pongo2/v6 v6.0.0 // indirect
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
Expand All @@ -62,14 +62,14 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.4 // indirect
github.com/klauspost/compress v1.18.6 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/mattn/go-runewidth v0.0.20 // indirect
github.com/mattn/go-sqlite3 v1.14.34 // indirect
github.com/mattn/go-runewidth v0.0.23 // indirect
github.com/mattn/go-sqlite3 v1.14.44 // indirect
github.com/miekg/pkcs11 v1.1.2 // indirect
github.com/mistifyio/go-zfs/v3 v3.1.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
Expand Down Expand Up @@ -105,22 +105,23 @@ require (
github.com/vbatts/tar-split v0.12.2 // indirect
github.com/vbauerster/mpb/v8 v8.12.0 // indirect
github.com/zitadel/logging v0.7.0 // indirect
github.com/zitadel/oidc/v3 v3.45.4 // indirect
github.com/zitadel/oidc/v3 v3.47.5 // indirect
github.com/zitadel/schema v1.3.2 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
go.opentelemetry.io/otel v1.40.0 // indirect
go.opentelemetry.io/otel/metric v1.40.0 // indirect
go.opentelemetry.io/otel/trace v1.40.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.podman.io/storage v1.62.0 // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/net v0.50.0 // indirect
golang.org/x/oauth2 v0.35.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/term v0.40.0 // indirect
go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect
golang.org/x/crypto v0.50.0 // indirect
golang.org/x/net v0.53.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/term v0.42.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260223185530-2f722ef697dc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260223185530-2f722ef697dc // indirect
google.golang.org/grpc v1.79.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading