From fddde6574a46904f709ecb89c5bea383de6bbecf Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 13 Mar 2017 16:23:17 +0100 Subject: [PATCH] Ubuntu appliance and support for official docker appliances --- appliances/alpine-linux.gns3a | 34 +- appliances/ubuntu.gns3a | 18 + schemas/appliance.json | 3 +- symbols/ubuntu.svg | 1750 +++++++++++++++++++++++++++++++++ symbols/ubuntu.txt | 10 + 5 files changed, 1785 insertions(+), 30 deletions(-) create mode 100644 appliances/ubuntu.gns3a create mode 100644 symbols/ubuntu.svg create mode 100644 symbols/ubuntu.txt diff --git a/appliances/alpine-linux.gns3a b/appliances/alpine-linux.gns3a index 8fe3e3c..dda7caa 100644 --- a/appliances/alpine-linux.gns3a +++ b/appliances/alpine-linux.gns3a @@ -6,36 +6,14 @@ "vendor_url": "http://alpinelinux.org", "documentation_url": "http://wiki.alpinelinux.org", "product_name": "Alpine Linux", - "registry_version": 1, - "status": "experimental", + "registry_version": 4, + "status": "stable", "maintainer": "GNS3 Team", "maintainer_email": "developers@gns3.net", - "usage": "User is root. Password is gns3", "symbol": "linux_guest.svg", - "qemu": { - "adapter_type": "e1000", + "docker": { "adapters": 1, - "ram": 32, - "arch": "x86_64", - "console_type": "telnet", - "kvm": "allow" - }, - "images": [ - { - "filename": "alpine-linux-3.2.3.qcow2", - "version": "3.2.3", - "md5sum": "b82d895ecba270ecc5e5b445ec53ee02", - "filesize": 143065088, - "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/", - "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/alpine-linux-3.2.3.qcow2" - } - ], - "versions": [ - { - "name": "3.2.3", - "images": { - "hda_disk_image": "alpine-linux-3.2.3.qcow2" - } - } - ] + "image": "alpine", + "console_type": "telnet" + } } diff --git a/appliances/ubuntu.gns3a b/appliances/ubuntu.gns3a new file mode 100644 index 0000000..99f2b44 --- /dev/null +++ b/appliances/ubuntu.gns3a @@ -0,0 +1,18 @@ +{ + "name": "Ubuntu", + "category": "guest", + "description": "Ubuntu is a Debian-based Linux operating system, with Unity as its default desktop environment. It is based on free software and named after the Southern African philosophy of ubuntu (literally, \"human-ness\"), which often is translated as \"humanity towards others\" or \"the belief in a universal bond of sharing that connects all humanity\".", + "vendor_name": "Canonical", + "vendor_url": "http://www.ubuntu.com", + "product_name": "Ubuntu", + "registry_version": 4, + "status": "stable", + "maintainer": "GNS3 Team", + "maintainer_email": "developers@gns3.net", + "symbol": "linux_guest.svg", + "docker": { + "adapters": 1, + "image": "ubuntu-debootstrap", + "console_type": "telnet" + } +} diff --git a/schemas/appliance.json b/schemas/appliance.json index 35bdb99..462e02f 100644 --- a/schemas/appliance.json +++ b/schemas/appliance.json @@ -110,8 +110,7 @@ }, "image": { "type": "string", - "title": "Docker image in the Docker Hub", - "pattern": ".+:.+" + "title": "Docker image in the Docker Hub" }, "start_command": { "type": "string", diff --git a/symbols/ubuntu.svg b/symbols/ubuntu.svg new file mode 100644 index 0000000..9a94055 --- /dev/null +++ b/symbols/ubuntu.svg @@ -0,0 +1,1750 @@ + + + + + + + + + + + + hash + + hardware + computer + + + + + Andy Fitzsimon + + + + + Andy Fitzsimon + + + + + Andy Fitzsimon + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/symbols/ubuntu.txt b/symbols/ubuntu.txt new file mode 100644 index 0000000..c110207 --- /dev/null +++ b/symbols/ubuntu.txt @@ -0,0 +1,10 @@ +Ubuntu Circle of Friends set for web: +Copyright 2017 Canonical Ltd. + +This work is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. + +Use of Canonical Trade Marks is subject to Canonical's IP Rights Policy. Canonical's IP Right Policy can be found at https://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy% + + +Computer Background: +Public Domain Computer from GNS3