diff --git a/pkg/executor/acl.go b/pkg/executor/acl.go index bfdc91ab..22ce4f29 100644 --- a/pkg/executor/acl.go +++ b/pkg/executor/acl.go @@ -25,7 +25,7 @@ import ( specs "github.com/MottainaiCI/lxd-compose/pkg/specs" - lxd_api "github.com/lxc/lxd/shared/api" + lxd_api "github.com/canonical/lxd/shared/api" ) func (e *LxdCExecutor) GetAclList() ([]string, error) { diff --git a/pkg/executor/command.go b/pkg/executor/command.go index 316b617d..b7c3e9a3 100644 --- a/pkg/executor/command.go +++ b/pkg/executor/command.go @@ -30,9 +30,9 @@ import ( "golang.org/x/sys/unix" - lxd "github.com/lxc/lxd/client" - lxd_api "github.com/lxc/lxd/shared/api" - "github.com/lxc/lxd/shared/termios" + lxd "github.com/canonical/lxd/client" + lxd_api "github.com/canonical/lxd/shared/api" + "github.com/canonical/lxd/shared/termios" ) func (e *LxdCExecutor) RunCommandWithOutput(containerName, command string, envs map[string]string, outBuffer, errBuffer io.WriteCloser, entryPoint []string) (int, error) { diff --git a/pkg/executor/container.go b/pkg/executor/container.go index a24870c1..1b4593da 100644 --- a/pkg/executor/container.go +++ b/pkg/executor/container.go @@ -20,7 +20,7 @@ along with this program. If not, see . package executor import ( - lxd_api "github.com/lxc/lxd/shared/api" + lxd_api "github.com/canonical/lxd/shared/api" ) // Get the container data and the ETag diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go index 873bd5a8..b8fd3015 100644 --- a/pkg/executor/executor.go +++ b/pkg/executor/executor.go @@ -30,10 +30,10 @@ import ( log "github.com/MottainaiCI/lxd-compose/pkg/logger" - lxd "github.com/lxc/lxd/client" - lxd_config "github.com/lxc/lxd/lxc/config" - lxd_api "github.com/lxc/lxd/shared/api" - lxd_cli "github.com/lxc/lxd/shared/cmd" + lxd "github.com/canonical/lxd/client" + lxd_config "github.com/canonical/lxd/lxc/config" + lxd_api "github.com/canonical/lxd/shared/api" + lxd_cli "github.com/canonical/lxd/shared/cmd" ) type LxdCExecutor struct { diff --git a/pkg/executor/file.go b/pkg/executor/file.go index 7c85f9ae..d33c8ac3 100644 --- a/pkg/executor/file.go +++ b/pkg/executor/file.go @@ -32,14 +32,14 @@ import ( log "github.com/MottainaiCI/lxd-compose/pkg/logger" - lxd "github.com/lxc/lxd/client" - lxd_shared "github.com/lxc/lxd/shared" - lxd_cli "github.com/lxc/lxd/shared/cmd" - "github.com/lxc/lxd/shared/ioprogress" - lxd_units "github.com/lxc/lxd/shared/units" + lxd "github.com/canonical/lxd/client" + lxd_shared "github.com/canonical/lxd/shared" + lxd_cli "github.com/canonical/lxd/shared/cmd" + "github.com/canonical/lxd/shared/ioprogress" + lxd_units "github.com/canonical/lxd/shared/units" ) -// Based on code of lxc client tool https://github.com/lxc/lxd/blob/master/lxc/file.go +// Based on code of lxc client tool https://github.com/canonical/lxd/blob/master/lxc/file.go func (e *LxdCExecutor) RecursiveMkdir(nameContainer string, dir string, mode *os.FileMode, uid int64, gid int64) error { /* special case, every container has a /, we don't need to do anything */ @@ -98,7 +98,7 @@ func (e *LxdCExecutor) RecursiveMkdir(nameContainer string, dir string, mode *os return nil } -// Based on code of lxc client tool https://github.com/lxc/lxd/blob/master/lxc/file.go +// Based on code of lxc client tool https://github.com/canonical/lxd/blob/master/lxc/file.go func (e *LxdCExecutor) RecursivePushFile(nameContainer, source, target string) error { var targetIsFile bool = true var sourceIsFile bool = true @@ -250,7 +250,7 @@ func (e *LxdCExecutor) RecursivePushFile(nameContainer, source, target string) e return filepath.Walk(source, sendFile) } -// Based on code of lxc client tool https://github.com/lxc/lxd/blob/master/lxc/file.go +// Based on code of lxc client tool https://github.com/canonical/lxd/blob/master/lxc/file.go func (l *LxdCExecutor) RecursivePullFile(nameContainer string, destPath string, localPath string, localAsTarget bool) error { buf, resp, err := l.LxdClient.GetContainerFile(nameContainer, destPath) diff --git a/pkg/executor/internal.go b/pkg/executor/internal.go index 5acd7360..43fcbda8 100644 --- a/pkg/executor/internal.go +++ b/pkg/executor/internal.go @@ -24,9 +24,9 @@ import ( "strings" "time" - lxd "github.com/lxc/lxd/client" - lxd_api "github.com/lxc/lxd/shared/api" - lxd_cli "github.com/lxc/lxd/shared/cmd" + lxd "github.com/canonical/lxd/client" + lxd_api "github.com/canonical/lxd/shared/api" + lxd_cli "github.com/canonical/lxd/shared/cmd" ) func (e *LxdCExecutor) LaunchContainer(name, fingerprint string, profiles []string) error { diff --git a/pkg/executor/network.go b/pkg/executor/network.go index 93056656..b6da94e0 100644 --- a/pkg/executor/network.go +++ b/pkg/executor/network.go @@ -25,7 +25,7 @@ import ( specs "github.com/MottainaiCI/lxd-compose/pkg/specs" - lxd_api "github.com/lxc/lxd/shared/api" + lxd_api "github.com/canonical/lxd/shared/api" ) func (e *LxdCExecutor) GetNetworkList() ([]string, error) { diff --git a/pkg/executor/profile.go b/pkg/executor/profile.go index 45af66ea..8deacce8 100644 --- a/pkg/executor/profile.go +++ b/pkg/executor/profile.go @@ -25,7 +25,7 @@ import ( specs "github.com/MottainaiCI/lxd-compose/pkg/specs" - lxd_api "github.com/lxc/lxd/shared/api" + lxd_api "github.com/canonical/lxd/shared/api" ) func (e *LxdCExecutor) GetProfilesList() ([]string, error) { diff --git a/pkg/executor/storage.go b/pkg/executor/storage.go index db645193..858f4fac 100644 --- a/pkg/executor/storage.go +++ b/pkg/executor/storage.go @@ -25,7 +25,7 @@ import ( specs "github.com/MottainaiCI/lxd-compose/pkg/specs" - lxd_api "github.com/lxc/lxd/shared/api" + lxd_api "github.com/canonical/lxd/shared/api" ) func (e *LxdCExecutor) GetStorageList() ([]string, error) {