*: replace images.linuxcontainers.org by images.lxd.canonical.com

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
canonical · Jun 20, 2024 · 9635572 · 9635572
1 parent 5385104
commit 9635572
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 LXD is a next generation system container and virtual machine manager.
 It offers a unified user experience around full Linux systems running inside containers or virtual machines.
 
-It's image based with pre-made images available for a [wide number of Linux distributions](https://images.linuxcontainers.org)
+It's image based with pre-made images available for a [wide number of Linux distributions](https://images.lxd.canonical.com)
 and is built around a very powerful, yet pretty simple, REST API.
 
 

diff --git a/client/doc.go b/client/doc.go
@@ -115,7 +115,7 @@
 //  }
 //
 //  // Connect to the remote SimpleStreams server
-//  d, err = lxd.ConnectSimpleStreams("https://images.linuxcontainers.org", nil)
+//  d, err = lxd.ConnectSimpleStreams("https://images.lxd.canonical.com", nil)
 //  if err != nil {
 //    return err
 //  }

diff --git a/doc/external_resources.md b/doc/external_resources.md
@@ -4,5 +4,5 @@
 :maxdepth: 1
 
 Project repository <https://github.com/canonical/lxd>
-Image server <https://images.linuxcontainers.org>
+Image server <https://images.lxd.canonical.com>
 ```
diff --git a/doc/metadata.yaml b/doc/metadata.yaml
@@ -121,5 +121,5 @@ navigation:
           external: true
 
         - title: Image server
-          location: https://images.linuxcontainers.org
+          location: https://images.lxd.canonical.com
           external: true
diff --git a/doc/rest-api.yaml b/doc/rest-api.yaml
@@ -900,7 +900,7 @@ definitions:
         x-go-name: Protocol
       server:
         description: URL of the source server
-        example: https://images.linuxcontainers.org
+        example: https://images.lxd.canonical.com
         type: string
         x-go-name: Server
     type: object
@@ -1017,7 +1017,7 @@ definitions:
         x-go-name: Secret
       server:
         description: URL of the source server
-        example: https://images.linuxcontainers.org
+        example: https://images.lxd.canonical.com
         type: string
         x-go-name: Server
       type:
@@ -1837,7 +1837,7 @@ definitions:
         x-go-name: Websockets
       server:
         description: Remote server URL (for remote images)
-        example: https://images.linuxcontainers.org
+        example: https://images.lxd.canonical.com
         type: string
         x-go-name: Server
       source:

diff --git a/shared/api/image.go b/shared/api/image.go
@@ -204,7 +204,7 @@ type ImageSource struct {
 	Protocol string `json:"protocol" yaml:"protocol"`
 
 	// URL of the source server
-	// Example: https://images.linuxcontainers.org
+	// Example: https://images.lxd.canonical.com
 	Server string `json:"server" yaml:"server"`
 
 	// Type of image (container or virtual-machine)

diff --git a/shared/api/instance.go b/shared/api/instance.go
@@ -267,7 +267,7 @@ type InstanceSource struct {
 	Properties map[string]string `json:"properties,omitempty" yaml:"properties,omitempty"`
 
 	// Remote server URL (for remote images)
-	// Example: https://images.linuxcontainers.org
+	// Example: https://images.lxd.canonical.com
 	Server string `json:"server,omitempty" yaml:"server,omitempty"`
 
 	// Remote server secret (for remote private images)

diff --git a/shared/util_test.go b/shared/util_test.go
@@ -25,7 +25,7 @@ func TestURLEncode(t *testing.T) {
 }
 
 func TestUrlsJoin(t *testing.T) {
-	baseUrl := "http://images.linuxcontainers.org/streams/v1/"
+	baseUrl := "http://images.lxd.canonical.com/streams/v1/"
 	path := "../../image/root.tar.xz"
 
 	res, err := JoinUrls(baseUrl, path)
@@ -34,7 +34,7 @@ func TestUrlsJoin(t *testing.T) {
 		return
 	}
 
-	expected := "http://images.linuxcontainers.org/image/root.tar.xz"
+	expected := "http://images.lxd.canonical.com/image/root.tar.xz"
 	if res != expected {
 		t.Error(fmt.Errorf("'%s' != '%s'", res, expected))
 	}

diff --git a/test/suites/remote.sh b/test/suites/remote.sh
@@ -12,7 +12,7 @@ test_remote_url() {
   # shellcheck disable=2153
   urls="${LXD_DIR}/unix.socket unix:${LXD_DIR}/unix.socket unix://${LXD_DIR}/unix.socket"
   if [ -z "${LXD_OFFLINE:-}" ]; then
-    urls="images.linuxcontainers.org https://images.linuxcontainers.org ${urls}"
+    urls="images.lxd.canonical.com https://images.lxd.canonical.com ${urls}"
   fi
 
   # an invalid protocol returns an error
@@ -146,8 +146,8 @@ test_remote_admin() {
 
   # Check that we can add domains with valid certs without confirmation:
   if [ -z "${LXD_OFFLINE:-}" ]; then
-    lxc_remote remote add images1 images.linuxcontainers.org
-    lxc_remote remote add images2 images.linuxcontainers.org:443
+    lxc_remote remote add images1 images.lxd.canonical.com
+    lxc_remote remote add images2 images.lxd.canonical.com:443
     lxc_remote remote remove images1
     lxc_remote remote remove images2
   fi