Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Incus 6.0 #832

Merged
merged 2 commits into from
Apr 7, 2024
Merged

Switch to Incus 6.0 #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbf8250
gomod: Update dependencies
stgraber Apr 7, 2024
24067ed
incus: Bump to 6.0
stgraber Apr 7, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ import (
"strings"
"time"

incus "github.com/lxc/incus/shared/util"
incus "github.com/lxc/incus/v6/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
View file
Open in desktop
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/client"
"github.com/lxc/incus/shared/api"
client "github.com/lxc/incus/v6/client"
"github.com/lxc/incus/v6/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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"strings"

"github.com/flosch/pongo2/v4"
incus "github.com/lxc/incus/shared/util"
incus "github.com/lxc/incus/v6/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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strconv"
"strings"

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

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

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

"github.com/lxc/distrobuilder/image"
"github.com/lxc/distrobuilder/shared"
Expand Down
2 changes: 1 addition & 1 deletion generators/cloud-init_test.go
View file
Open in desktop
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/shared/util"
incus "github.com/lxc/incus/v6/shared/util"
"github.com/stretchr/testify/require"

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

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

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

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

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

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

"github.com/lxc/distrobuilder/image"
"github.com/lxc/distrobuilder/shared"
Expand Down
2 changes: 1 addition & 1 deletion generators/incus-agent.go
View file
Open in desktop
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/shared/util"
incus "github.com/lxc/incus/v6/shared/util"

"github.com/lxc/distrobuilder/image"
"github.com/lxc/distrobuilder/shared"
Expand Down
2 changes: 1 addition & 1 deletion generators/template.go
View file
Open in desktop
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/shared/api"
"github.com/lxc/incus/v6/shared/api"

"github.com/lxc/distrobuilder/image"
"github.com/lxc/distrobuilder/shared"
Expand Down
69 changes: 37 additions & 32 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,65 +10,67 @@ exclude (
)

require (
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3
github.com/flosch/pongo2/v4 v4.0.2
github.com/google/go-github/v56 v56.0.0
github.com/lxc/incus v0.5.1
github.com/lxc/incus/v6 v6.0.1-0.20240406203506-ae41ae87afc9
github.com/mudler/docker-companion v0.4.6-0.20211015133729-bd4704fad372
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
golang.org/x/sys v0.17.0
github.com/stretchr/testify v1.9.0
golang.org/x/sys v0.19.0
golang.org/x/text v0.14.0
gopkg.in/antchfx/htmlquery.v1 v1.2.2
gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.11.4 // indirect
github.com/antchfx/xpath v1.2.5 // indirect
github.com/Microsoft/hcsshim v0.12.2 // indirect
github.com/antchfx/xpath v1.3.0 // indirect
github.com/apex/log v1.9.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/containerd v1.7.13 // indirect
github.com/containerd/cgroups/v3 v3.0.3 // indirect
github.com/containerd/containerd v1.7.15 // indirect
github.com/containerd/continuity v0.4.3 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v25.0.3+incompatible // indirect
github.com/docker/docker v26.0.0+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/flosch/pongo2/v4 v4.0.2 // indirect
github.com/fsouza/go-dockerclient v1.10.2 // indirect
github.com/fsouza/go-dockerclient v1.11.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/schema v1.2.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/heroku/docker-registry-client v0.0.0-20211012143308-9463674c8930 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/klauspost/compress v1.17.6 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/muhlemmer/gu v0.3.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runc v1.1.12 // indirect
github.com/opencontainers/runtime-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/opencontainers/umoci v0.4.8-0.20211009121349-9c76304c034d // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.6 // indirect
Expand All @@ -79,20 +81,23 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/urfave/cli v1.22.14 // indirect
github.com/vbatts/go-mtree v0.5.3 // indirect
github.com/zitadel/oidc/v2 v2.12.0 // indirect
github.com/zitadel/logging v0.6.0 // indirect
github.com/zitadel/oidc/v3 v3.19.0 // indirect
github.com/zitadel/schema v1.3.0 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/tools v0.20.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/grpc v1.63.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.0 // indirect
)
Loading
Loading