diff --git a/meganav.yaml b/meganav.yaml index a8ce0940fa9..ad57e73c7c3 100644 --- a/meganav.yaml +++ b/meganav.yaml @@ -46,7 +46,7 @@ products: primary_links: - links: - title: Ubuntu Desktop - description: Secure enterprise Linux + description: Fast, modern and secure Linux url: /desktop - title: Ubuntu Server description: Scalable Linux for the cloud @@ -93,7 +93,7 @@ products: primary_links: - links: - title: Ubuntu Desktop - description: Secure enterprise Linux + description: Fast, modern and secure Linux url: /desktop - title: Ubuntu Server description: Scalable Linux for the cloud @@ -109,7 +109,7 @@ products: url: /security/fips - title: WSL description: Windows Subsystem for Linux - url: /wsl + url: /desktop/wsl - title: Multipass description: VMs for Windows, macOS & Linux url: https://multipass.run/ @@ -156,6 +156,9 @@ products: - title: Private cloud build description: OpenStack implementation url: /openstack/consulting + - title: MicroStack + description: Cloud-native OpenStack + url: https://microstack.run/ - title: MicroCloud description: Lightweight, automated clouds url: https://canonical.com/microcloud @@ -207,7 +210,7 @@ products: url: https://canonical.com/lxd - title: WSL description: Windows Subsystem for Linux - url: /wsl + url: /desktop/wsl secondary_links: - title: Quick links @@ -305,66 +308,53 @@ products: - title: Kubeflow installation tutorial url: https://charmed-kubeflow.io/docs/install - - title: Charmhub and Juju + - title: AI and data primary_links: - links: - - title: Charmhub - description: Store for Juju operators - url: https://charmhub.io/ - - title: Juju - description: Orchestrator engine for operators - url: https://juju.is/ - - title: JAAS - description: Auditing and compliance for Juju - url: https://jaas.ai/ + - title: AI/ML + description: AI and machine learning on Ubuntu + url: /ai + - title: Kubeflow + description: End-to-end MLOps platform + url: https://charmed-kubeflow.io/ + - title: MLflow + description: Lightweight ML platform + url: /ai/mlflow + - title: Data solutions + description: Enterprise data management at scale + url: https://canonical.com/data + - title: Kafka + description: Streaming data platform + url: https://canonical.com/data/kafka + - title: Spark + description: Big data processing + url: https://canonical.com/data/spark + - title: MongoDB + description: NoSQL database management + url: https://canonical.com/data/mongodb + - title: PostgreSQL + description: Relational database management + url: https://canonical.com/data/postgresql + - title: MySQL + description: Relational database management + url: https://canonical.com/data/mysql + - title: OpenSearch + description: Search and analytics suite + url: https://canonical.com/data/opensearch secondary_links: - title: Quick links links: - - title: Juju documentation - url: https://juju.is/docs - - title: Getting started with Juju - url: https://juju.is/tutorials - - title: Charmhub forum - url: https://discourse.charmhub.io/ - - title: Juju blog - url: https://juju.is/blog - - title: Matrix community - url: https://matrix.to/#/#charmhub-juju:ubuntu.com - - title: Write your first charm - url: https://juju.is/tutorials/build-and-deploy-mini-charm - - - title: Snapcraft - primary_links: - - links: - - title: Snap Store - description: App store for Linux - url: https://snapcraft.io/ - - title: Snaps - description: Universal Linux packages - url: https://snapcraft.io/about - - title: Snapcraft - description: Build and publish your snaps - url: https://snapcraft.io/build - - title: IoT App Store - description: Private app store for Linux and IoT - url: /internet-of-things/appstore - - secondary_links: - - title: Quick links - links: - - title: Getting started with snaps - url: http://snapcraft.io/docs/getting-started - - title: Snap documentation - url: https://snapcraft.io/docs - - title: "Tutorial: Create your first snap" - url: /tutorials/create-your-first-snap - - title: Snapcraft forum - url: https://forum.snapcraft.io/ - - title: Snapcraft blog - url: https://snapcraft.io/blog - - title: Build from GitHub - url: https://snapcraft.io/build + - title: Kubeflow documentation + url: https://charmed-kubeflow.io/docs + - title: MLflow documentation + url: https://documentation.ubuntu.com/charmed-mlflow/en/latest/ + - title: Data documentation + url: https://canonical.com/data/docs + - title: MLOps toolkit + url: /engage/mlops-toolkit/ + - title: Guide to big data and AI + url: /engage/open-source-big-data-ai - title: Certified hardware primary_links: @@ -402,7 +392,7 @@ products: - title: Why buy a preinstalled workstation? url: /blog/why-you-should-buy-a-pre-installed-ubuntu-workstation - - title: IoT and Edge + - title: IoT and edge primary_links: - links: - title: Ubuntu Core @@ -446,6 +436,42 @@ products: - title: Industry 4.0 webinar url: /engage/bridge-the-IT-OT-gap-Industry4 + - title: Developer tools + primary_links: + - links: + - title: Snaps + description: Containerised applications for Linux + url: https://snapcraft.io/about + - title: Snapcraft + description: Build and publish your snaps + url: https://snapcraft.io/build + - title: Snap Store + description: App store for Linux + url: https://snapcraft.io + - title: Juju + description: Orchestrator engine for operators + url: https://juju.is/ + - title: Charmhub + description: Software operators collection + url: https://charmhub.io/ + - title: JAAS + description: Auditing and compliance for Juju + url: https://jaas.ai/ + + secondary_links: + - title: Quick links + links: + - title: Snap documentation + url: https://snapcraft.io/docs + - title: Create your first snap + url: /tutorials/create-your-first-snap + - title: Juju documentation + url: https://juju.is/docs + - title: Getting started with Juju + url: https://juju.is/docs/juju/tutorial + - title: Write your first charm + url: https://juju.is/docs/sdk/from-zero-to-hero-write-your-first-kubernetes-charm + use_case: primary_links: - title: By solution @@ -902,6 +928,8 @@ get_ubuntu: url: /download/xilinx - title: Mediatek Genio url: /download/mediatek-genio + - title: NVIDIA Jetson + url: /download/nvidia-jetson section_footer: cta_title: Get Ubuntu for IoT cta_url: /download/iot @@ -950,7 +978,7 @@ get_ubuntu: - links: - title: WSL description: Windows Subsystem for Linux - url: /wsl + url: /desktop/wsl - title: Multipass description: Ubuntu VMs for Windows and macOS url: https://multipass.run/ diff --git a/static/files/sitemap.xml b/static/files/sitemap.xml index 6f8f601bec5..514bb6428a7 100644 --- a/static/files/sitemap.xml +++ b/static/files/sitemap.xml @@ -1006,4 +1006,8 @@ https://ubuntu.com/ai/contact-us?product=ai-index 2024-02-22T08:45:57+00:00 + + https://ubuntu.com/download/nvidia-jetson + 2024-03-06T00:00:00+00:00 + \ No newline at end of file diff --git a/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.test.tsx b/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.test.tsx index eeb54082cf3..c31c9736d04 100644 --- a/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.test.tsx +++ b/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.test.tsx @@ -22,8 +22,8 @@ test("Feature section renders correctly", () => { ); - screen.getAllByText("Ubuntu Pro"); - screen.getAllByText("Ubuntu Pro (Infra-only)"); + screen.getAllByText("Pro - all repositories"); + screen.getAllByText("Infra - only limited subset"); }); test("Feature sections disables Infra + Apps if destkop is selected", () => { diff --git a/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx b/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx index 4b8ee020c73..f0950671bf1 100644 --- a/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx +++ b/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx @@ -25,206 +25,314 @@ const Feature = () => { const proDisabled = version === LTSVersions.trusty; return ( -
- - -
- - Security coverage for critical, high and selected medium CVEs for: - -
-
-

- Over 2,300 open source deb packages in Ubuntu Main repository for - 10 years, including: -

-
- Systemd - RabbitMQ - OpenSSL - Ruby - PHP - NGINX - MySQL -
-
-
-

- Over 23,000 open source deb packages in Ubuntu Universe repository - for 10 years, including: -

-
- Apache Tomcat - Agios - NodeJS - Puppet - Redis - Rust - Wordpress -
-
+ <> + + +

What security coverage do you need?

- +
- +

+ Not sure? Run pro security-status to find out which + packages and repositories you are currently using. +

+ +
+
+ +
+ + + + +

{feature === Features.pro ? "25,000" : "2,300"}

+ +

+ packages in Ubuntu Main{" "} + {feature === Features.pro ? "and Universe" : ""} +

+ + +
-
+ ); }; diff --git a/static/js/src/advantage/subscribe/react/components/Form/Form.tsx b/static/js/src/advantage/subscribe/react/components/Form/Form.tsx index c306cd5292e..10c74035ed9 100644 --- a/static/js/src/advantage/subscribe/react/components/Form/Form.tsx +++ b/static/js/src/advantage/subscribe/react/components/Form/Form.tsx @@ -76,12 +76,7 @@ const Form = () => {
- -

What security coverage do you need?

- - - - +
diff --git a/static/js/src/advantage/subscribe/react/components/ProductSummary/ProductSummary.tsx b/static/js/src/advantage/subscribe/react/components/ProductSummary/ProductSummary.tsx index 470c76b5f71..03aa6075dc4 100644 --- a/static/js/src/advantage/subscribe/react/components/ProductSummary/ProductSummary.tsx +++ b/static/js/src/advantage/subscribe/react/components/ProductSummary/ProductSummary.tsx @@ -37,7 +37,7 @@ const ProductSummary = () => { return ( <>
{
+
diff --git a/templates/download/nvidia-jetson/index.html b/templates/download/nvidia-jetson/index.html new file mode 100644 index 00000000000..5e494061ecf --- /dev/null +++ b/templates/download/nvidia-jetson/index.html @@ -0,0 +1,80 @@ +{% extends "download/_base_download.html" %} + +{% block title %}Install Ubuntu on NVIDIA Jetson{% endblock %} + +{% block meta_description %}Use Ubuntu on NVIDIA Jetson for the familiar developer experience and an accelerated path to production{% endblock meta_description %} + +{% block meta_copydoc%}https://docs.google.com/document/d/1DHLqBbo6xIHDp-Uc8ngo1t5-GJgeTdTVwBvZRIKyZ0Y/edit{% endblock meta_copydoc %} + +{% block content %} + +
+
+
+
+ {{ image ( + url="https://assets.ubuntu.com/v1/cb6924a9-Nvidia_image_logo.svg", + alt="Nvidia", + width="180", + height="138", + hi_def=True, + loading="auto" + ) | safe + }} +
+
+
+

Install Ubuntu on NVIDIA Jetson

+

Run Ubuntu on your NVIDIA® Jetson™ Orin platforms to create breakthrough AI solutions across all industries, being available for all the enthusiasts for hands-on AI learning and making amazing projects and for enterprises delivering commercial solutions.

+

Pick the OS image to match your hardware, flash it onto a USB or NVMe disk, load it onto your board and away you go.

+

All images are 64-bit builds of Ubuntu.

+
+

+ Get in touch +

+
+
+
+ +
+
+
+
+

Choose a Jetson board

+
    +
    • +
    • +
+
+ +
+
+
+ {% include "download/nvidia-jetson/tab-1-jetson-agx-orin.html" %} + {% include "download/nvidia-jetson/tab-2-jetson-orin-nano.html" %} +
+
+
+ +
+
+
+
+
+
+

Are you working on a commercial project?

+
+
+

Canonical partners with silicon vendors, board manufacturers and leading enterprises to shorten time-to-market. If you are deploying Ubuntu on NVIDIA Jetson platforms at-scale, reach out to Canonical to get access to ongoing bug fixes, critical security patching, long-term support; or to learn more about our solutions for custom board enablement and application development services.

+

For information about using Canonical's Ubuntu images on a commercial project, read Canonical's IP policy.

+

If you have any questions about the platform or would like information about our certification program, contact us.

+
+
+
+
+
+ +{% endblock content %} diff --git a/templates/download/nvidia-jetson/tab-1-jetson-agx-orin.html b/templates/download/nvidia-jetson/tab-1-jetson-agx-orin.html new file mode 100644 index 00000000000..defc944cb3c --- /dev/null +++ b/templates/download/nvidia-jetson/tab-1-jetson-agx-orin.html @@ -0,0 +1,63 @@ + \ No newline at end of file diff --git a/templates/download/nvidia-jetson/tab-2-jetson-orin-nano.html b/templates/download/nvidia-jetson/tab-2-jetson-orin-nano.html new file mode 100644 index 00000000000..14b8e4ef98b --- /dev/null +++ b/templates/download/nvidia-jetson/tab-2-jetson-orin-nano.html @@ -0,0 +1,63 @@ + \ No newline at end of file