Skip to content

Commit b31d62a

Browse files
authored
Merge branch 'main' into linda-dashboard
2 parents a887099 + 8f135e1 commit b31d62a

File tree

11 files changed

+35
-19
lines changed

11 files changed

+35
-19
lines changed

blog/2024-03-28-slackbot-sample.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Now that we have everything set up, let's dive into the deployment process. Foll
4747
2. **Deploy the Slackbot:** Use the Defang CLI's `defang compose up` command to deploy.
4848
4949
## Usage
50-
With your Slackbot up and running, let's explore how to make the most of it. Simply send a POST request to the `/` endpoint with a JSON body containing the message you want to post to the Slack channel. Popular tools like cURL or Postman can help you send the request:
50+
With your Slackbot up and running, let's explore how to make the most of it. Let's send a POST request to the `/` endpoint with a JSON body containing the message you want to post to the Slack channel. Popular tools like cURL or Postman can help you send the request:
5151
5252
```bash
5353
curl 'https://raphaeltm-bot--8080.prod1.defang.dev/' \

blog/2024-05-01-may-product-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Hey folks! There is a lot going on at Defang and we're excited to share our late
1111

1212
## npx defang
1313

14-
We know a lot of you are using Defang for the first time. To make it easier to get started, we've added a new way to install the Defang CLI. Now you can use npx to run the CLI without installing it globally. Just run:
14+
We know a lot of you are using Defang for the first time. To make it easier to get started, we've added a new way to install the Defang CLI. Now you can use npx to run the CLI without installing it globally by running:
1515

1616
```bash
1717
npx defang@latest

blog/2024-12-04-launch-week.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ At **Defang**, we’re enabling developers go from **idea to code to deployment
3333

3434
- **Production-Ready Support for AWS**
3535

36-
Seamlessly deploy and scale with confidence on [AWS](https://docs.defang.io/docs/providers/aws). Defang is now [WAFR](https://aws.amazon.com/premiumsupport/business-support-well-architected/)-compliant, assuring that your deployments confirm to all the best-practices for AWS deployments. Defang is now officially part of the [AWS Partner Network](https://aws.amazon.com/partners/).
36+
Seamlessly deploy and scale with confidence on [AWS](https://docs.defang.io/docs/providers/aws). Defang is now [WAFR](https://aws.amazon.com/premiumsupport/business-support-well-architected/)-compliant, assuring that your deployments conform to all the best-practices for AWS deployments. Defang is now officially part of the [AWS Partner Network](https://aws.amazon.com/partners/).
3737

3838
- **New - Google Cloud Platform ([GCP](https://docs.defang.io/docs/providers/gcp)) in Preview**
3939

@@ -51,7 +51,7 @@ As we move into V1, we are also rolling out our differentiated product tiers, al
5151

5252
We’ve lined up an exciting week of activities to showcase the power of **Defang** and bring together our growing community:
5353

54-
- **December 4: Vancouver CDW x AWS re:Invent WatchParty**
54+
- **December 4: Vancouver CDW x AWS re:Invent Watch Party**
5555

5656
Join us at the Vancouver [CDW x AWS re:Invent Watch Party](https://lu.ma/1r0zsw76), where we will have a booth showcasing Defang’s capabilities and AWS integration. Stop by to learn more about Defang and see a live demo from the Defang dev team.
5757

docs/concepts/accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Eventually, billing and payment information will be associated with your account
1616

1717
## Creating an Account
1818

19-
To create an account, simply login to Defang and accept the [terms of service](https://defang.io/terms-service.html) using the [CLI](/docs/concepts/authentication.md).
19+
To create an account, login to Defang and accept the [terms of service](https://defang.io/terms-service.html) using the [CLI](/docs/concepts/authentication.md).
2020

2121
At the moment, the only way to authenticate with Defang is through GitHub. We plan to offer other authentication providers in the future.
2222

docs/concepts/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You can find a sample of how to set environment variables with Pulumi [here](htt
1414

1515
# Sensitive Config aka Secrets
1616

17-
The Defang CLI allows you to securely store sensitive information such as API keys, passwords, and other credentials. To do so just run:
17+
The Defang CLI allows you to securely store sensitive information such as API keys, passwords, and other credentials. To do so, run:
1818

1919
```bash
2020
# Set a configuration value called API_KEY

docs/concepts/managed-storage/managed-postgres.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To use managed Postgres, in your `compose.yaml` file, use the `x-defang-postgres
2222

2323
### Required Configuration
2424

25-
When using managed Postgres, you **must** set a password for the database using `defang config set POSTGRES_PASSWORD`. If you do not provide the password, the deployment will fail.
25+
When using managed Postgres, you **must** set a password for the database using `defang config set POSTGRES_PASSWORD`. If you do not provide the password, the deployment will fail.
2626

2727
- `POSTGRES_PASSWORD`: You can can assign the password in the service's environment variables. To learn more about how this works, read about [configuration](../configuration.md).
2828

@@ -38,7 +38,7 @@ You can also set the following optional environment variables to configure the m
3838
You can connect to the managed Postgres instance using the name of your service as the hostname, `POSTGRES_USER`, `POSTGRES_DB`, and `POSTGRES_PASSWORD` environment variables.
3939

4040
### Example
41-
:::info
41+
:::info
4242
For a smoother experience with Defang, we recommend using Postgres 14 for your container images. This version provides easier access and improved usability.
4343
:::
4444

@@ -85,7 +85,7 @@ The AWS Console can be used to restore a snapshop into a new instance of postgre
8585
<!--
8686
### Major Version Updating of Engine
8787
88-
To update the database engine you can simply update the image to a later version in your Compose file and apply it via ```defang compose up --provider=aws```. In the example below, we change from Postgres 15 to 16.
88+
To update the database engine you can update the image to a later version in your Compose file and apply it via ```defang compose up --provider=aws```. In the example below, we change from Postgres 15 to 16.
8989
9090
Please note the upgrading will occur immediately and may result in the database being unavailable for some time.
9191

docs/providers/aws/aws.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ To deploy your services, the Defang CLI packages your code and uploads it to an
5252

5353
The provider runs your workloads using ECS using Fargate. It provisions a VPC with public and private subnets, and deploys your services to the private subnets. It then provisions an Application Load Balancer (ALB) and routes traffic to your services.
5454

55+
### Service Discovery
56+
57+
Defang uses a Route53 private hosted zone for service discovery. Each (private) service in the Compose file will get a CNAME or A record which resolves to the service's AWS domain name or IP, respectively. To update the A records for the dynamically assigned IP addresses, Defang will add a [Route53 sidecar](https://github.com/DefangLabs/route53-sidecar) alongside your container.
58+
5559
## Managed Storage
5660

5761
Defang can help you provision [managed storage](/docs/concepts/managed-storage/managed-storage.md) services. The following managed storage services are supported on AWS:

docs/providers/digitalocean/digitalocean.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ The Defang CLI will automatically check if these envinonment variables are set b
3939

4040
### Deploy your project to DigitalOcean
4141

42-
Once you are ready to go, add the `--provider=digitalocean` to your command to tell the Defang CLI to use the DigitalOcean provider.
43-
42+
Once you are ready to go, add the `--provider=digitalocean` to your command to tell the Defang CLI to use the DigitalOcean provider or set the `DEFANG_PROVIDER` environment variable to `digitalocean`.
4443
```bash
4544
$ defang compose up --provider=digitalocean
4645
# or

docs/providers/gcp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ gcloud init
2727
gcloud auth application-default login
2828
```
2929

30-
The Defang CLI will automatically check if `GCP_PROJECT_ID` environment variable is set and correctly authenticated with GCP before running. Once you are ready to go, add the `--provider=gcp` to your command to tell the Defang CLI to use the GCP provider.
30+
The Defang CLI will automatically check if `GCP_PROJECT_ID` environment variable is set and correctly authenticated with GCP before running. Once you are ready to go, add the `--provider=gcp` flag to your command to tell the Defang CLI to use the GCP provider, or set the `DEFANG_PROVIDER` environment variable to `gcp`.
3131

3232
```bash
33-
$ defang up --provider=gcp
33+
$ defang compose up --provider=gcp
3434
# or
35-
$ DEFANG_PROVIDER=gcp defang up
35+
$ export DEFANG_PROVIDER=gcp
3636
```
3737

3838
## Location

docs/tutorials/deploy-to-gcp.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ After signing in to your GCP account, select an existing project or [create a ne
2727

2828
## Step 3 - Deploy
2929

30-
Invoke the `defang up` CLI command with the `--provider=gcp` flag or set the `DEFANG_PROVIDER=gcp` environment variable.
30+
Invoke the `defang compose up` CLI command with the `--provider=gcp` flag or set the `DEFANG_PROVIDER=gcp` environment variable.
3131

3232
For example:
3333

3434
```bash
35-
$ defang up --provider=gcp
35+
$ defang compose up --provider=gcp
3636
```
3737

3838
## Step 4 - Inspect your deployment

0 commit comments

Comments
 (0)