move installing page into "Getting Started"

jordanstephens · jordanstephens · commit ad6aae18e3b4 · 2024-11-29T10:37:55.000-08:00
diff --git a/blog/2024-03-28-slackbot-sample.md b/blog/2024-03-28-slackbot-sample.md
@@ -11,7 +11,7 @@ Hey folks! Today, I'm going to share one of our code samples that will show you
 
 Before we dive into the details, let's make sure you have everything you need to get started:
 
-1.  **Install Defang CLI:** Simplify your deployment process by installing the Defang CLI tool. Follow the instructions [here](https://docs.defang.io/docs/getting-started/installing) to get it up and running quickly.
+1.  **Install Defang CLI:** Simplify your deployment process by installing the Defang CLI tool. Follow the instructions [here](https://docs.defang.io/docs/getting-started#install-the-defang-cli) to get it up and running quickly.
 
 2.  **Slack API Token:** Create a Slack App at https://api.slack.com/apps, granting it the necessary permissions, including the bot `chat:write` scope.
 ![screenshot of the slack admin UI showing the bot scopes](/img/slackbot-sample/scopes.png)
diff --git a/docs/concepts/authentication.md b/docs/concepts/authentication.md
@@ -15,5 +15,5 @@ defang login
 This will prompt you to open a browser and log into your Defang account. For now, the only way to login is with GitHub, though we will offer other providers to authenticate in the future. Once you've logged in, you can close the browser and return to the terminal. You should see a message that you've successfully logged in.
 
 :::warning
-Keep in mind that your Defang account is separate from your [cloud provider account](../concepts/defang-byoc.md). You will need to authenticate with your cloud provider account separately to deploy services to your own cloud account.
+Keep in mind that your Defang account is separate from your [cloud provider account](/docs/concepts/defang-byoc). You will need to authenticate with your cloud provider account separately to deploy services to your own cloud account.
 :::
diff --git a/docs/concepts/generate.md b/docs/concepts/generate.md
@@ -6,7 +6,7 @@ sidebar_position: 100
 
 # Generate
 
-Defang includes an AI-driven agent that translates natural language prompts to an outline for your project that you can then refine. The AI agent is available through the [Defang CLI](../getting-started/installing.md).
+Defang includes an AI-driven agent that translates natural language prompts to an outline for your project that you can then refine. The AI agent is available through the [Defang CLI](../getting-started#install-the-defang-cli.md).
 
 :::info
 The AI agent is currently in preview and only supports a limited set of prompts, varying in complexity. We plan to expand the capabilities of the AI agent in the future.
diff --git a/docs/getting-started/getting-started.md b/docs/getting-started/getting-started.md
@@ -4,12 +4,61 @@ title: Getting Started
 description: Get started with Defang.
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
 # Getting Started
 
+## Install the Defang CLI
+
+Defang doesn't require installing anything in your cloud, but you will need to install the [open source](https://github.com/DefangLabs/defang) Defang command line interface (CLI) to interact with your Defang resources and account.
+
+We offer a few different ways to install the Defang CLI. You can use a shell script, Homebrew, Winget, or you can download the binary directly.
+
+
+<Tabs>
+  <TabItem value="bash" label="Shell">
+    **Using a shell script**
+
+    You can install the Defang CLI using a shell script. Run the following command in your terminal:
+
+    ```bash
+    eval "$(curl -fsSL s.defang.io/install)"
+    ```
+
+    The script will try to download the appropriate binary for your operating system and architecture, add it to `~/.local/bin`, and add `~/.local/bin` to your `PATH` if it's not already there, with your permission. If you do not provide permission it will print an appropriate instruction for you to follow to add it manually. You can also customize the installation directory by setting the `INSTALL_DIR` environment variable before running the script.
+  </TabItem>
+  <TabItem value="homebrew" label="Homebrew" default>
+    **Using Homebrew**
+
+    You can easily install the Defang CLI using [Homebrew](https://brew.sh/). Run the following command in your terminal:
+
+    ```bash
+    brew install DefangLabs/defang/defang
+    ```
+  </TabItem>
+  <TabItem value="winget" label="Winget">
+    **Using Winget**
+
+    On Windows, you can install the Defang CLI using `winget`. Run the following command in your terminal:
+
+    ```powershell
+    winget install defang
+    ```
+  </TabItem>
+  <TabItem value="nix" label="Nix">
+    **Using Nix**
 
-## Install the CLI
+    ```bash
+    nix profile install github:DefangLabs/defang#defang-bin --refresh
+    ```
+  </TabItem>
+  <TabItem value="direct" label="Direct Download">
+    **Direct Download**
 
-First, you'll need to install the Defang CLI. The CLI is the primary way to interact with Defang. It allows you to create, deploy, and manage your services. You can find the [different installation methods here](./installing.md).
+    You can find the latest version of the Defang CLI on the [latest release page](https://github.com/DefangLabs/defang/releases/latest). Just download the appropriate binary for your operating system and architecture, and put it somewhere in your `PATH`.
+  </TabItem>
+</Tabs>
 
 ## Generate a project
 
diff --git a/docs/getting-started/installing.md b/docs/getting-started/installing.md
diff --git a/docs/intro/features.mdx b/docs/intro/features.mdx
@@ -17,6 +17,6 @@ Defang provides a streamlined experience to develop, deploy, observe, and update
 - Ability to express your project configuration using a [Docker Compose YAML](/docs/concepts/compose.md) file
 - Ability to manage [encrypted configuration values](/docs/concepts/configuration.md)
 - Pre-configured environments with built-in [security](/docs/concepts/security.md), [networking](/docs/concepts/networking.mdx), and [observability](/docs/concepts/observability.md)
-- [One-command deployments](/docs/getting-started/installing.md)
+- [One-command deployments](/docs/getting-started#install-the-defang-cli.md)
 - Support for [GPUs](/docs/concepts/resources.md)
 - Support for Infra-as-Code via the [Defang Pulumi provider](/docs/concepts/pulumi.md)
diff --git a/docs/intro/what-is-defang.mdx b/docs/intro/what-is-defang.mdx
@@ -10,7 +10,7 @@ description: What is Defang?
 
 Defang is a radically simpler way for developers to develop, deploy, and debug their cloud applications. Defang enables you to easily author cloud application in any language, build and deploy to the cloud with a single command, and iterate quickly with AI-assisted tooling.
 
-- The [Defang CLI](/docs/getting-started/installing.md) includes an AI-driven agent that translates natural language prompts to an outline for your project that you can then refine.
+- The [Defang CLI](/docs/getting-started#install-the-defang-cli.md) includes an AI-driven agent that translates natural language prompts to an outline for your project that you can then refine.
 - Defang can automatically build and deploy your project with a single command.
     - If you’re new to Defang, you can try deploying to the [Defang Playground](/docs/concepts/defang-playground.md), a hosted environment to learn to use Defang with non-production workloads.
     - Once you’re ready, you can [deploy](/docs/concepts/deployments.md) it to your own cloud account - we call this [Defang BYOC](/docs/concepts/defang-byoc.md). Defang takes care of all the heavy lifting such as configuring networking, security, [observability](/docs/concepts/observability.md) and all the other details that usually slow down the average cloud developer.
diff --git a/docs/tutorials/deploy-to-aws.mdx b/docs/tutorials/deploy-to-aws.mdx
@@ -12,7 +12,7 @@ This tutorial will show you how to deploy your services to your own AWS account
 * [A Dockerfile in your project](https://docs.docker.com/get-started/docker-concepts/building-images/writing-a-dockerfile/)
 * [A `compose.yaml` file in your project](https://docs.docker.com/compose/gettingstarted/)
 * [A Defang Account](/docs/concepts/authentication)
-* [The Defang CLI](/docs/getting-started/installing)
+* [The Defang CLI](/docs/getting-started#install-the-defang-cli)
 * [AWS Account Credentials](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-authentication.html)
 
 ## Step 1 - Navigate to your project directory
diff --git a/docs/tutorials/deploy-to-digitalocean.mdx b/docs/tutorials/deploy-to-digitalocean.mdx
@@ -12,7 +12,7 @@ This tutorial will show you how to deploy your services to your own DigitalOcean
 * [A Dockerfile in your project](https://docs.docker.com/get-started/docker-concepts/building-images/writing-a-dockerfile/)
 * [A `compose.yaml` file in your project](https://docs.docker.com/compose/gettingstarted/)
 * [A Defang Account](/docs/concepts/authentication)
-* [The Defang CLI](/docs/getting-started/installing)
+* [The Defang CLI](/docs/getting-started#install-the-defang-cli)
 * [DigitalOcean Account Credentials](/docs/providers/digitalocean#getting-started)
 * [DigitalOcean Spaces Access Keys](/docs/providers/digitalocean#getting-started)
 
diff --git a/docs/tutorials/deploy-to-playground.mdx b/docs/tutorials/deploy-to-playground.mdx
@@ -12,7 +12,7 @@ This tutorial will show you how to deploy your project to the Defang Playground.
 * [A Dockerfile in your project](https://docs.docker.com/get-started/docker-concepts/building-images/writing-a-dockerfile/)
 * [A `compose.yaml` file in your project](https://docs.docker.com/compose/gettingstarted/)
 * [A Defang Account](/docs/concepts/authentication)
-* [The Defang CLI](/docs/getting-started/installing)
+* [The Defang CLI](/docs/getting-started#install-the-defang-cli)
 
 ## Step 1 - Navigate to your project directory
 Head to the folder where your project is located.
diff --git a/docs/tutorials/deploy-using-pulumi.mdx b/docs/tutorials/deploy-using-pulumi.mdx
@@ -9,7 +9,7 @@ sidebar_position: 400
 
 ## Installing Dependencies
 
-Make sure to install the [Pulumi CLI](https://www.pulumi.com/docs/install/) and the [Defang CLI](../getting-started/installing.md).
+Make sure to install the [Pulumi CLI](https://www.pulumi.com/docs/install/) and the [Defang CLI](../getting-started#install-the-defang-cli.md).
 
 Make sure you are logged into the [Defang CLI](/docs/concepts/authentication.md). Don't worry about the Pulumi CLI for now.
 
diff --git a/docs/tutorials/deploy-with-gpu.mdx b/docs/tutorials/deploy-with-gpu.mdx
@@ -31,7 +31,7 @@ You'll need to clone [this sample](https://github.com/DefangLabs/samples/tree/ma
 
 ## Step 2 - Check your [Defang BYOC](../concepts/defang-byoc.md) settings
 
-* Make sure you [install the latest version of the Defang CLI](../getting-started/installing.md)
+* Make sure you [install the latest version of the Defang CLI](../getting-started#install-the-defang-cli.md)
 * Then, make sure you have properly [authenticated your AWS account](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html). The Defang CLI makes use of AWS environment variables like `AWS_PROFILE`, `AWS_REGION`, `AWS_ACCESS_KEY_ID`, and `AWS_SECRET_ACCESS_KEY`, so make sure the correct values are set for those.
 
 :::tip
diff --git a/docs/tutorials/use-your-own-domain-name.mdx b/docs/tutorials/use-your-own-domain-name.mdx
@@ -12,7 +12,7 @@ In our latest version of [Defang BYOC](https://docs.defang.io/docs/concepts/defa
 
 ## Step 1 - Check your [Defang BYOC](../concepts/defang-byoc.md) settings
 
-* Make sure you [install the latest version of the Defang CLI](../getting-started/installing.md)
+* Make sure you [install the latest version of the Defang CLI](../getting-started#install-the-defang-cli.md)
 * Then, make sure you have properly [authenticated your AWS account](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html). The Defang CLI makes use of AWS environment variables like `AWS_PROFILE`, `AWS_REGION`, `AWS_ACCESS_KEY_ID`, and `AWS_SECRET_ACCESS_KEY`, so make sure the correct values are set for those.
 
 If you use the AWS CLI, you can verify that your are authenticated against AWS using the following command (note that the AWS CLI itself is not required to use the defang cli in BYOC mode):
@@ -67,4 +67,4 @@ defang compose up
 
 This will deploy your service and set up the necessary DNS records in Route 53 as seen in the screenshot below as well as provision SSL certificates. You can now access your service at the domain you specified in your compose file.
 
-<img src="/img/domains-tutorial/route53-records.png" alt="Route 53 DNS Records Screenshot" />
+<img src="/img/domains-tutorial/route53-records.png" alt="Route 53 DNS Records Screenshot" />
diff --git a/src/components/Samples/index.tsx b/src/components/Samples/index.tsx
@@ -179,7 +179,7 @@ export default function Samples() {
                             {/* <Stack direction="row" justifyContent="center" px={1} spacing={2}> */}
                             <Box sx={{ flexGrow: 1, overflow: 'auto', '& .theme-code-block': { mb: 0 } }}>
                                 <small>
-                                    Use this sample (<b><a href="https://docs.defang.io/docs/getting-started/installing" target="_blank">requires Defang CLI v0.5.21 or later</a></b>)
+                                    Use this sample (<b><a href="https://docs.defang.io/docs/getting-started#install-the-defang-cli" target="_blank">requires Defang CLI v0.5.21 or later</a></b>)
                                 </small>
                                 <CodeBlock language="bash">
                                     {`defang generate ${selectedSample.name}`}
diff --git a/static/samples.json b/static/samples.json
@@ -82,7 +82,7 @@
   {
     "name": "nextjs",
     "category": "nodejs",
-    "readme": "# Next.js × Defang\n\nA basic Next.js app with a Dockerfile and docker-compose ready to deploy to AWS with [Defang](https://defang.io).\n\n## Steps\n\n1. [Install Defang](https://docs.defang.io/docs/getting-started/installing)\n2. [Authenticate with Defang](https://docs.defang.io/docs/concepts/authentication)\n3. (optional) [Authenticate with AWS](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html)\n4. Run `defang compose up` in the root of this project"
+    "readme": "# Next.js × Defang\n\nA basic Next.js app with a Dockerfile and docker-compose ready to deploy to AWS with [Defang](https://defang.io).\n\n## Steps\n\n1. [Install Defang](https://docs.defang.io/docs/getting-started#install-the-defang-cli)\n2. [Authenticate with Defang](https://docs.defang.io/docs/concepts/authentication)\n3. (optional) [Authenticate with AWS](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html)\n4. Run `defang compose up` in the root of this project"
   },
   {
     "name": "nextjs-boilerplate",
@@ -92,7 +92,7 @@
   {
     "name": "nextjs-github-actions",
     "category": "nodejs",
-    "readme": "# Next.js × Defang\n\nA basic Next.js app with a Dockerfile and docker-compose ready to deploy to AWS with [Defang](https://defang.io).\n\n## Steps\n\n1. [Install Defang](https://docs.defang.io/docs/getting-started/installing)\n2. [Authenticate with Defang](https://docs.defang.io/docs/concepts/authentication)\n3. (optional) [Authenticate with AWS](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html)\n4. Run `defang compose up` in the root of this project"
+    "readme": "# Next.js × Defang\n\nA basic Next.js app with a Dockerfile and docker-compose ready to deploy to AWS with [Defang](https://defang.io).\n\n## Steps\n\n1. [Install Defang](https://docs.defang.io/docs/getting-started#install-the-defang-cli)\n2. [Authenticate with Defang](https://docs.defang.io/docs/concepts/authentication)\n3. (optional) [Authenticate with AWS](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html)\n4. Run `defang compose up` in the root of this project"
   },
   {
     "name": "remix-aiven-postgres",
