Skip to content

Commit

Permalink
lxd/config: Add ubuntu-minimal and ubuntu-minimal-daily remotes
Browse files Browse the repository at this point in the history
Signed-off-by: Din Music <[email protected]>
(cherry picked from commit b365672)
Signed-off-by: Simon Deziel <[email protected]>
  • Loading branch information
MusicDin authored and simondeziel committed Jun 26, 2024
1 parent 3fe463d commit aa5172c
Showing 1 changed file with 44 additions and 8 deletions.
52 changes: 44 additions & 8 deletions lxc/config/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,56 @@ var UbuntuDailyRemote = Remote{
Protocol: "simplestreams",
}

// UbuntuMinimalRemote is the Ubuntu minimal image server (over simplestreams).
var UbuntuMinimalRemote = Remote{

Check failure on line 34 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, ubuntu-latest)

previous declaration

Check failure on line 34 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, macos-latest)

previous declaration

Check failure on line 34 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, windows-latest)

previous declaration
Addr: "https://cloud-images.ubuntu.com/minimal/releases/",
Static: true,
Public: true,
Protocol: "simplestreams",
}

// UbuntuMinimalDailyRemote is the Ubuntu daily minimal image server (over simplestreams).
var UbuntuMinimalDailyRemote = Remote{

Check failure on line 42 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, ubuntu-latest)

previous declaration

Check failure on line 42 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, macos-latest)

previous declaration

Check failure on line 42 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, windows-latest)

previous declaration
Addr: "https://cloud-images.ubuntu.com/minimal/daily/",
Static: true,
Public: true,
Protocol: "simplestreams",
}

// UbuntuMinimalRemote is the Ubuntu minimal image server (over simplestreams).
var UbuntuMinimalRemote = Remote{

Check failure on line 50 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.16.x, ubuntu-latest)

UbuntuMinimalRemote redeclared in this block

Check failure on line 50 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.16.x, macos-latest)

UbuntuMinimalRemote redeclared in this block

Check failure on line 50 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.16.x, windows-latest)

UbuntuMinimalRemote redeclared in this block

Check failure on line 50 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, ubuntu-latest)

UbuntuMinimalRemote redeclared in this block

Check failure on line 50 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, macos-latest)

UbuntuMinimalRemote redeclared in this block

Check failure on line 50 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, windows-latest)

UbuntuMinimalRemote redeclared in this block
Addr: "https://cloud-images.ubuntu.com/minimal/releases/",
Static: true,
Public: true,
Protocol: "simplestreams",
}

// UbuntuMinimalDailyRemote is the Ubuntu daily minimal image server (over simplestreams).
var UbuntuMinimalDailyRemote = Remote{

Check failure on line 58 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.16.x, ubuntu-latest)

UbuntuMinimalDailyRemote redeclared in this block

Check failure on line 58 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.16.x, macos-latest)

UbuntuMinimalDailyRemote redeclared in this block

Check failure on line 58 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.16.x, windows-latest)

UbuntuMinimalDailyRemote redeclared in this block

Check failure on line 58 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, ubuntu-latest)

UbuntuMinimalDailyRemote redeclared in this block

Check failure on line 58 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, macos-latest)

UbuntuMinimalDailyRemote redeclared in this block

Check failure on line 58 in lxc/config/default.go

View workflow job for this annotation

GitHub Actions / test (1.17.x, windows-latest)

UbuntuMinimalDailyRemote redeclared in this block
Addr: "https://cloud-images.ubuntu.com/minimal/daily/",
Static: true,
Public: true,
Protocol: "simplestreams",
}

// StaticRemotes is the list of remotes which can't be removed
var StaticRemotes = map[string]Remote{
"local": LocalRemote,
"images": ImagesRemote,
"ubuntu": UbuntuRemote,
"ubuntu-daily": UbuntuDailyRemote,
"images": ImagesRemote,
"local": LocalRemote,
"ubuntu": UbuntuRemote,
"ubuntu-daily": UbuntuDailyRemote,
"ubuntu-minimal": UbuntuMinimalRemote,
"ubuntu-minimal-daily": UbuntuMinimalDailyRemote,
}

// DefaultRemotes is the list of default remotes
var DefaultRemotes = map[string]Remote{
"local": LocalRemote,
"images": ImagesRemote,
"ubuntu": UbuntuRemote,
"ubuntu-daily": UbuntuDailyRemote,
"images": ImagesRemote,
"local": LocalRemote,
"ubuntu": UbuntuRemote,
"ubuntu-daily": UbuntuDailyRemote,
"ubuntu-minimal": UbuntuMinimalRemote,
"ubuntu-minimal-daily": UbuntuMinimalDailyRemote,
}

// DefaultConfig is the default configuration
Expand Down

0 comments on commit aa5172c

Please sign in to comment.